Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9048] trunk/lib/WikiDB/adodb
|
From: <var...@us...> - 2014-08-25 13:35:33
|
Revision: 9048
http://sourceforge.net/p/phpwiki/code/9048
Author: vargenau
Date: 2014-08-25 13:35:28 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Update adodb
Modified Paths:
--------------
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.inc.php
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/docs/docs-adodb.htm
trunk/lib/WikiDB/adodb/docs/docs-datadict.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/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-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-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/lang/adodb-ca.inc.php
trunk/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php
trunk/lib/WikiDB/adodb/lang/adodb-sv.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/tests/benchmark.php
trunk/lib/WikiDB/adodb/tests/client.php
trunk/lib/WikiDB/adodb/tests/test-datadict.php
trunk/lib/WikiDB/adodb/tests/test-php5.php
trunk/lib/WikiDB/adodb/tests/test.php
trunk/lib/WikiDB/adodb/tests/test3.php
trunk/lib/WikiDB/adodb/tests/test4.php
trunk/lib/WikiDB/adodb/tests/test5.php
trunk/lib/WikiDB/adodb/tests/testcache.php
trunk/lib/WikiDB/adodb/tests/testdatabases.inc.php
trunk/lib/WikiDB/adodb/tests/testmssql.php
trunk/lib/WikiDB/adodb/tests/testoci8.php
trunk/lib/WikiDB/adodb/tests/testoci8cursor.php
trunk/lib/WikiDB/adodb/tests/testpaging.php
trunk/lib/WikiDB/adodb/tests/testpear.php
trunk/lib/WikiDB/adodb/tests/testsessions.php
trunk/lib/WikiDB/adodb/toexport.inc.php
trunk/lib/WikiDB/adodb/tohtml.inc.php
Added Paths:
-----------
trunk/lib/WikiDB/adodb/drivers/adodb-text.inc.php
Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/*
-@version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+@version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Latest version is available at http://adodb.sourceforge.net
Released under both BSD license and Lesser GPL library license.
Modified: trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/*
-@version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+@version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Latest version is available at http://adodb.sourceforge.net
Released under both BSD license and Lesser GPL library license.
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -8,7 +8,7 @@
/*
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Modified: trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-datadict.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-datadict.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/**
- * @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/**
- * @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/**
- * @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
* Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- * @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
@@ -29,9 +29,9 @@
{
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\")\n";
break;
case 'PCONNECT':
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/*
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -6,7 +6,7 @@
$ADODB_INCLUDED_LIB = 1;
/*
- @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@@ -543,7 +543,7 @@
return $rsreturn;
}
-// Iv\xE1n Oliva version
+// Iván Oliva version
function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0)
{
Modified: trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -7,11 +7,11 @@
$ADODB_INCLUDED_MEMCACHE = 1;
global $ADODB_INCLUDED_CSV;
-if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
/*
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Modified: trunk/lib/WikiDB/adodb/adodb-pager.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pager.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-pager.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/*
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/**
- * @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-perf.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-perf.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-perf.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/*
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,5 +1,5 @@
<?php
-/**
+/*
ADOdb Date Library, part of the ADOdb abstraction library
Download: http://phplens.com/phpeverywhere/
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -14,7 +14,7 @@
/**
\mainpage
- @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license. You can choose which license
you prefer.
@@ -179,7 +179,7 @@
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
+ $ADODB_vers = 'V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
/**
* Determines whether recordset->RecordCount() is used.
@@ -294,8 +294,8 @@
if (strlen($ADODB_CACHE_DIR) > 1) {
$rez = $this->_dirFlush($ADODB_CACHE_DIR);
- if ($debug) ADOConnection::outp( "flushall: $dir<br><pre>\n". $rez."</pre>");
- }
+ if ($debug) ADOConnection::outp( "flushall: $ADODB_CACHE_DIR<br><pre>\n". $rez."</pre>");
+ }
return $rez;
}
@@ -461,7 +461,7 @@
{
global $ADODB_vers;
- $ok = preg_match( '/^[Vv]?([0-9]\.[0-9]+(dev|[a-z]))?/', $ADODB_vers, $matches );
+ $ok = preg_match( '/^[Vv]?([0-9]\.[0-9]+(dev|[a-z])?)/', $ADODB_vers, $matches );
if (!$ok) return (float) substr($ADODB_vers,1);
else return $matches[1];
}
@@ -1899,38 +1899,37 @@
$forceUpdate means that even if the data has not changed, perform update.
*/
- function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
+ function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $forceUpdate = true, $magicq = false)
{
- $false = false;
- $sql = 'SELECT * FROM '.$table;
- if ($where!==FALSE) $sql .= ' WHERE '.$where;
- else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
- $this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
- return $false;
+ if ($where === false && ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) ) {
+ $this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause', 'AutoExecute');
+ return false;
}
- $rs = $this->SelectLimit($sql,1);
- if (!$rs) return $false; // table does not exist
+ $sql = "SELECT * FROM $table";
+ $rs = $this->SelectLimit($sql, 1);
+ if (!$rs) return false; // table does not exist
+
$rs->tableName = $table;
+ if ($where !== false) {
+ $sql .= " WHERE $where";
+ }
$rs->sql = $sql;
- 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:
- $this->outp_throw("AutoExecute: Unknown mode=$mode",'AutoExecute');
- return $false;
+ 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;
}
- $ret = false;
- if ($sql) $ret = $this->Execute($sql);
- if ($ret) $ret = true;
- return $ret;
+ return $sql && $this->Execute($sql);
}
@@ -2716,7 +2715,7 @@
/**
* 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\xE1n Oliva to provide recordset pagination.
+ * and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
*
* See docs-adodb.htm#ex8 for an example of usage.
*
@@ -2743,7 +2742,7 @@
/**
* 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\xE1n Oliva to provide recordset pagination.
+ * 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
@@ -2943,9 +2942,9 @@
var $_obj; /** Used by FetchObj */
var $_names; /** Used by FetchObj */
- var $_currentPage = -1; /** Added by Iv\xE1n Oliva to implement recordset pagination */
- var $_atFirstPage = false; /** Added by Iv\xE1n Oliva to implement recordset pagination */
- var $_atLastPage = false; /** Added by Iv\xE1n Oliva to implement recordset pagination */
+ 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;
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -24,7 +24,7 @@
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;
@@ -128,7 +128,7 @@
return $sql;
}
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
{
$f = array();
list($lines,$pkey) = $this->_GenFields($flds);
@@ -141,7 +141,7 @@
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);
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
<?php
/**
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/docs/docs-adodb.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-adodb.htm 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-adodb.htm 2014-08-25 13:35:28 UTC (rev 9048)
@@ -620,7 +620,7 @@
<h2>ADOdb Library for PHP</h2>
-<p>V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
+<p>V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
<p><span style='font-size:7.5pt'>This software is dual licensed using BSD-Style
and LGPL. This means you can use it in compiled proprietary and commercial
@@ -6170,8 +6170,15 @@
<h2>Change Log<a name=changes></a><a name=changelog></a></h2>
+<p><a name=5.20><b>5.20 - ??-???-2014</b>
+<p>adodb: AutoExecute correctly handles empty result set in case of updates. See Github #13.
+<p>adodb: Fix regex in Version(). See Github #16
+<p>datadict: oci8 strict-standards compliance. See Github #18
+<p>memcache: use include_once() to avoid issues with PHPUnit. See http://phplens.com/lens/lensforum/msgs.php?id=19489
+<p>mssqlnative: Use ADOConnection::outp instead of error_log. See Github #12
+<p>postgres7: fix system warning in MetaColumns() with schema. See http://phplens.com/lens/lensforum/msgs.php?id=19481
+
<p><a name=5.19><b>5.19 - 23-Apr-2014</b>
-<p>
<p>adodb: GetRowAssoc will return null as required. See http://phplens.com/lens/lensforum/msgs.php?id=19289
<p>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
<p>adodb: GetAssoc will return a zero-based array when 2nd column is null. See https://sourceforge.net/p/adodb/bugs/130/
Modified: trunk/lib/WikiDB/adodb/docs/docs-datadict.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-datadict.htm 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-datadict.htm 2014-08-25 13:35:28 UTC (rev 9048)
@@ -20,7 +20,7 @@
</head>
<body style="background-color: rgb(255, 255, 255);">
<h2>ADOdb Data Dictionary Library for PHP</h2>
-<p>V5.19 23-Apr-2014 (c) 2000-2014 John Lim (<a
+<p>V5.20dev ??-???-2014 (c) 2000-2014 John Lim (<a
href="mailto:jlim#natsoft.com">jlim#natsoft.com</a>).<br>
AXMLS (c) 2004 ars Cognita, Inc</p>
<p><font size="1">This software is dual licensed using BSD-Style and
Modified: trunk/lib/WikiDB/adodb/docs/docs-perf.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-perf.htm 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-perf.htm 2014-08-25 13:35:28 UTC (rev 9048)
@@ -18,7 +18,7 @@
</head>
<body>
<h3>The ADOdb Performance Monitoring Library</h3>
-<p>V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
+<p>V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
<p><font size="1">This software is dual licensed using BSD-Style and
LGPL. This means you can use it in compiled proprietary and commercial
products.</font></p>
Modified: trunk/lib/WikiDB/adodb/docs/docs-session.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-session.htm 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-session.htm 2014-08-25 13:35:28 UTC (rev 9048)
@@ -21,7 +21,7 @@
<body style="background-color: rgb(255, 255, 255);">
<h1>ADODB Session 2 Management Manual</h1>
<p>
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)
</p>
<p> <font size="1">This software is dual licensed using BSD-Style and
LGPL. This means you can use it in compiled proprietary and commercial
Modified: trunk/lib/WikiDB/adodb/docs/docs-session.old.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-session.old.htm 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-session.old.htm 2014-08-25 13:35:28 UTC (rev 9048)
@@ -21,7 +21,7 @@
<body style="background-color: rgb(255, 255, 255);">
<h3>ADODB Session Management Manual</h3>
<p>
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)
</p>
<p> <font size="1">This software is dual licensed using BSD-Style and
LGPL. This means you can use it in compiled proprietary and commercial
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
- V5.19 23-Apr-2014 (c) 2000-2012 (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2012 (jlim#natsoft.com). All rights reserved.
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
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
- @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/**
-* @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+* @version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim. All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 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.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
- V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
<?php
/*
-V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -128,18 +128,18 @@
function ADODB_mssqlnative()
{
- if ($this->debug) {
- error_log("<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('warnings_return_as_errors', 0);
- } else {
- sqlsrv_set_error_handling(0);
- sqlsrv_log_set_severity(0);
- sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
- sqlsrv_configure('warnings_return_as_errors', 0);
- }
+ 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('warnings_return_as_errors', 0);
+ } else {
+ sqlsrv_set_error_handling(0);
+ sqlsrv_log_set_severity(0);
+ sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+ sqlsrv_configure('warnings_return_as_errors', 0);
+ }
}
function ServerVersion() {
$data = $this->ServerInfo();
@@ -239,13 +239,13 @@
*/
function CreateSequence2008($seq='adodbseq',$start=1)
{
- if($this->debug) error_log("<hr>CreateSequence($seq,$start)");
+ 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) error_log("<hr>Error: ROLLBACK");
+ if($this->debug) ADOConnection::outp("<hr>Error: ROLLBACK");
sqlsrv_rollback($this->_connectionID);
return false;
}
@@ -272,7 +272,7 @@
*/
function GenID2008($seq='adodbseq',$start=1)
{
- if($this->debug) error_log("<hr>CreateSequence($seq,$start)");
+ 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) {
@@ -280,7 +280,7 @@
$this->Execute("create table $seq (id int)");//was float(53)
$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
if (!$ok) {
- if($this->debug) error_log("<hr>Error: ROLLBACK");
+ if($this->debug) ADOConnection::outp("<hr>Error: ROLLBACK");
sqlsrv_rollback($this->_connectionID);
return false;
}
@@ -383,7 +383,7 @@
{
if ($this->transOff) return true;
$this->transCnt += 1;
- if ($this->debug) error_log('<hr>begin transaction');
+ if ($this->debug) ADOConnection::outp('<hr>begin transaction');
sqlsrv_begin_transaction($this->_connectionID);
return true;
}
@@ -391,7 +391,7 @@
function CommitTrans($ok=true)
{
if ($this->transOff) return true;
- if ($this->debug) error_log('<hr>commit transaction');
+ if ($this->debug) ADOConnection::outp('<hr>commit transaction');
if (!$ok) return $this->RollbackTrans();
if ($this->transCnt) $this->transCnt -= 1;
sqlsrv_commit($this->_connectionID);
@@ -400,7 +400,7 @@
function RollbackTrans()
{
if ($this->transOff) return true;
- if ($this->debug) error_log('<hr>rollback transaction');
+ if ($this->debug) ADOConnection::outp('<hr>rollback transaction');
if ($this->transCnt) $this->transCnt -= 1;
sqlsrv_rollback($this->_connectionID);
return true;
@@ -480,14 +480,14 @@
$connectionInfo["Database"]=$argDatabasename;
$connectionInfo["UID"]=$argUsername;
$connectionInfo["PWD"]=$argPassword;
- if ($this->debug) error_log("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
- //if ($this->debug) error_log("<hr>_connectionID before: ".serialize($this->_connectionID));
+ 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) error_log( "<hr><b>errors</b>: ".print_r( sqlsrv_errors(), true));
+ if ($this->debug) ADOConnection::outp( "<hr><b>errors</b>: ".print_r( sqlsrv_errors(), true));
return false;
}
- //if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
- //if ($this->debug) error_log("<hr>defined functions: <pre>".var_export(get_defined_functions(),true)."</pre>");
+ //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;
}
@@ -558,9 +558,9 @@
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 [^;]+);?$/i', $sql)) {
@@ -573,7 +573,7 @@
$rez = sqlsrv_query($this->_connectionID,$sql);
}
- if ($this->debug) error_log("<hr>running query: ".var_export($sql,true)."<hr>input array: ".var_export($inputarr,true)."<hr>result: ".var_export($rez,true));
+ 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;
@@ -852,14 +852,14 @@
function _initrs()
{
global $ADODB_COUNTRECS;
- # KMN # if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+ # 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."
- error_log("rowsaff: ".serialize($retRowsAff));
+ 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) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+ # 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
*/
@@ -995,16 +995,16 @@
// speedup
function MoveNext()
{
- //# KMN # if ($this->connection->debug) error_log("movenext()");
- //# KMN # if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
+ //# 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) error_log("_currentRow: ".$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) error_log("eof (end): ".$this->EOF);
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("eof (end): ".$this->EOF);
return false;
}
@@ -1014,13 +1014,13 @@
// 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) error_log("_fetch()");
+ # 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) error_log("fetch mode: both");
+ //# 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) error_log("fetch mode: assoc");
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: assoc");
$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
}
@...
[truncated message content] |
