[20915] improvement: Update adodb to latest from upstream
Sigurd Nes <[email protected]>
| Newsgroups | gmane.comp.web.phpgroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 20915
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20915
Author: sigurdne
Date: 2010-01-05 20:55:35 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
improvement: Update adodb to latest from upstream
Modified Paths:
--------------
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-active-record.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-csvlib.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-datadict.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-errorhandler.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-exceptions.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-iterator.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-memcache.lib.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-pager.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-perf.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-php4.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-access.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-db2.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-firebird.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-generic.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-ibase.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-informix.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssqlnative.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mysql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-oci8.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-postgres.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-sybase.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-active-record.htm
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-adodb.htm
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-datadict.htm
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-access.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado5.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_access.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_mssql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-borland_ibase.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-csv.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-firebird.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ibase.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-informix72.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ldap.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssqlnative.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqli.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlpo.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlt.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-netezza.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8po.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_db2.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_mssql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_oracle.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oracle.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mssql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mysql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_oci.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres64.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres7.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres8.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-proxy.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sapdb.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlite.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlitepo.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase_ase.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-vfp.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/pear/Auth/Container/ADOdb.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-db2.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-informix.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssqlnative.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mysql.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-oci8.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-postgres.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-bzip2.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-gzip.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession2.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-mcrypt.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-md5.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-secret.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob2.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session2.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/old/adodb-cryptsession.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test-active-record.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test.php
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/testdatabases.inc.php
Added Paths:
-----------
people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2oci.inc.php
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-active-record.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-active-record.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-active-record.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-@version V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+@version V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -26,6 +26,7 @@
$_ADODB_ACTIVE_DBS = array();
$ACTIVE_RECORD_SAFETY = true;
$ADODB_ACTIVE_DEFVALS = false;
+$ADODB_ACTIVE_CACHESECS = 0;
class ADODB_Active_DB {
var $db; // ADOConnection
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-csvlib.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-csvlib.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-csvlib.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -8,7 +8,7 @@
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -71,6 +71,7 @@
$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
$class = $rs->connection->arrayClass;
$rs2 = new $class();
+ $rs2->timeCreated = $rs->timeCreated; # memcache fix
$rs2->sql = $rs->sql;
$rs2->oldProvider = $rs->dataProvider;
$rs2->InitArrayFields($rows,$flds);
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-datadict.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-datadict.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-datadict.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -519,7 +519,7 @@
// genfields can return FALSE at times
if ($lines == null) $lines = array();
list(,$first) = each($lines);
- list(,$column_def) = split("[\t ]+",$first,2);
+ list(,$column_def) = preg_split("/[\t ]+/",$first,2);
}
return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
}
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-errorhandler.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-errorhandler.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-errorhandler.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/**
- * @version V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-exceptions.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-exceptions.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-exceptions.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- * @version V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-iterator.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-iterator.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-iterator.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-memcache.lib.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-memcache.lib.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-memcache.lib.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -65,7 +65,7 @@
$memcache = new MemCache;
- if (!is_array($this->hosts)) $this->hosts = array($hosts);
+ if (!is_array($this->hosts)) $this->hosts = array($this->hosts);
$failcnt = 0;
foreach($this->hosts as $host) {
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-pager.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-pager.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-pager.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-perf.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-perf.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-perf.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-php4.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-php4.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb-php4.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/adodb.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -14,7 +14,7 @@
/**
\mainpage
- @version V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ @version V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -177,7 +177,7 @@
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
+ $ADODB_vers = 'V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
/**
* Determines whether recordset->RecordCount() is used.
@@ -516,9 +516,6 @@
$this->_isPersistentConnection = false;
- global $ADODB_CACHE;
- if (empty($ADODB_CACHE)) $this->_CreateCache();
-
if ($forceNew) {
if ($rez=$this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
} else {
@@ -585,9 +582,6 @@
$this->_isPersistentConnection = true;
- global $ADODB_CACHE;
- if (empty($ADODB_CACHE)) $this->_CreateCache();
-
if ($rez = $this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
if (isset($rez)) {
$err = $this->ErrorMsg();
@@ -722,7 +716,7 @@
* @param $table name of table to lock
* @param $where where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
*/
- function RowLock($table,$where)
+ function RowLock($table,$where,$col='1 as ignore')
{
return false;
}
@@ -1711,6 +1705,8 @@
{
global $ADODB_CACHE_DIR, $ADODB_CACHE;
+ if (empty($ADODB_CACHE)) return false;
+
if (!$sql) {
$ADODB_CACHE->flushall($this->debug);
return;
@@ -1767,6 +1763,8 @@
{
global $ADODB_CACHE;
+ if (empty($ADODB_CACHE)) $this->_CreateCache();
+
if (!is_numeric($secs2cache)) {
$inputarr = $sql;
$sql = $secs2cache;
@@ -1879,6 +1877,7 @@
$rs = $this->SelectLimit($sql,1);
if (!$rs) return $false; // table does not exist
$rs->tableName = $table;
+ $rs->sql = $sql;
switch((string) $mode) {
case 'UPDATE':
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-access.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-access.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-access.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-db2.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-db2.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-db2.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-firebird.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-firebird.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-firebird.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-generic.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-generic.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-generic.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-ibase.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-ibase.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-ibase.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-informix.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-informix.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-informix.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssqlnative.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssqlnative.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mssqlnative.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mysql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mysql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-mysql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-oci8.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-oci8.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-oci8.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-postgres.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-postgres.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-postgres.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-sybase.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-sybase.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/datadict/datadict-sybase.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/**
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-active-record.htm
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-active-record.htm 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-active-record.htm 2010-01-05 20:55:35 UTC (rev 20915)
@@ -289,15 +289,22 @@
<h3><li>Primary Keys</h3>
<p>
ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete.
-<p>Sometimes you are retrieving data from a view or table that has no primary key, but has a unique index. You can dynamically set the primary key of a table through the constructor, or using ADOdb_Active_Record::SetPrimaryKeys():
+<p>Sometimes you are retrieving data from a view or table that has no primary key, but has a unique index. You can dynamically set the primary key of a table through the constructor:
<pre>
$pkeys = array('category','prodcode');
// set primary key using constructor
$rec = new ADOdb_Active_Record('Products', $pkeys);
- // or use method
- $rec->SetPrimaryKeys($pkeys);
+ // or define a new class
+ class Product extends ADOdb_Active_Record {
+ function __construct()
+ {
+ parent::__construct('Products', array('prodid'));
+ }
+ }
+
+ $rec = new Product();
</pre>
@@ -629,8 +636,9 @@
# ADODB_Active_Record::ClassHasMany('Account', 'transactions','account_id');
$acc = new Account();
$acc->Load('id=23');
+
+ $start = 0;
while(true) {
- $start = 0;
$acc->LoadRelations('transactions',"tx_done=0 order by trxdate", $start, $start+100);
if (!$acc->transactions) break;
foreach ($acc->transactions as $k => $trx) {
@@ -639,6 +647,9 @@
$trx->save();
}
$start += 100;
+ unset($acc->transactions);
+
+
}
</pre>
<p>The $offset is 0-based, and $limit is the number of records to retrieve. The default is to ignore $offset (-1) and $limit (-1).
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-adodb.htm
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-adodb.htm 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-adodb.htm 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1367,7 +1367,10 @@
style='mso-tab-count:1'>\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0 </span>$db =& ADONewConnection($dbms);</pre><pre><span
style='mso-tab-count:1'>\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0 </span>$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP;".</pre><pre><span
style='mso-tab-count:4'>\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0 </span>"uid=root; pwd=secret";<br>
-<span style='mso-tab-count:1'>\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0 </span>$db->Connect($dsn);</pre></div>
+<span style='mso-tab-count:1'>\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0 </span>$db->Connect($dsn);<br>
+ # or connect and set schema
+ $db->Connect($dsn,null,null,$schema);</pre>
+</div>
<p class=MsoNormal><b>DSN-less Connections with <st1:City w:st="on">ADO</st1:City></b><br>
If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections
@@ -1742,6 +1745,29 @@
Universal Database client.</span></p>
</td>
</tr>
+
+ <tr style='mso-yfti-irow:5;height:40.5pt'>
+ <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
+ <p class=MsoNormal><b><span style='font-size:10.0pt'>db2oci</span></b></p>
+ </td>
+ <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
+ <p class=MsoNormal><span style='font-size:10.0pt'>C</span></p>
+ </td>
+ <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
+ <p class=MsoNormal><span style='font-size:10.0pt'>Based on db2 driver. Allows use of oracle style :0, :1, :2 bind variables. Used with DB2 9.7 or later with PL/SQL mode turned on.</span></p>
+ </td>
+ <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
+ <p class=MsoNormal><span style='font-size:10.0pt'>Y/N</span></p>
+ </td>
+ <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
+ <p class=MsoNormal><span style='font-size:10.0pt'>DB2 CLI/ODBC interface</span></p>
+ </td>
+ <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
+ <p><span style='font-size:10.0pt'>Unix and Windows. Requires IBM DB2
+ Universal Database client.</span></p>
+ </td>
+ </tr>
+
<tr style='mso-yfti-irow:6;height:40.5pt'>
<td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
<p class=MsoNormal><b><span style='font-size:10.0pt'>odbc_db2</span></b></p>
@@ -6108,7 +6134,17 @@
PHP</a>. </p>
<h2>Change Log<a name=changes></a><a name=changelog></a></h2>
-
+<p><a name=5.10></a><b>5.10 10 Nov 2009</b> </p>
+<p>Fixed memcache to properly support $rs->timeCreated.
+<p>adodb-ado.inc.php: Added BigInt support for PHP5. Will return float instead to support large numbers. Thx nasb#mail.goo.ne.jp.
+<p>adodb-mysqli.inc.php: mysqli_multi_query is now turned off by default. To turn it on, use $conn->multiQuery = true; This is because of the risks of sql injection. See http://phplens.com/lens/lensforum/msgs.php?id=18144
+<p>New db2oci driver for db2 9.7 when using PL/SQL mode. Allows oracle style :0, :1, :2 bind parameters which are remapped to ? ? ?.
+<p>adodb-db2.inc.php: fixed bugs in MetaTables. SYS owner field not checked properly. Also in $conn->Connect($dsn, null, null, $schema) and PConnect($dsn, null, null, $schema), we do a SET SCHEMA=$schema if successful connection.
+<p>adodb-mysqli.inc.php: Now $rs->Close() closes all pending next resultsets. Thx Clifton mesmackgod#gmail.com
+<p>Moved _CreateCache() from PConnect()/Connect() to CacheExecute(). Suggested by Dumka.
+<p>Many bug fixes to adodb-pdo_sqlite.inc.php and new datadict-sqlite.inc.php. Thx Andrei B. [andreutz#mymail.ro]
+<p>Removed usage of split (deprecated in php 5.3). Thx david#horizon-nigh.org.
+<p>Fixed RowLock() parameters to comply with PHP5 strict mode in multiple drivers.
<p><a name=5.09></a><b>5.09 25 June 2009</b> </p>
<p>Active Record: You can force column names to be quoted in INSERT and UPDATE statements, typically because you are using reserved words as column names by setting
ADODB_Active_Record::$_quoteNames = true;
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-datadict.htm
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-datadict.htm 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/docs/docs-datadict.htm 2010-01-05 20:55:35 UTC (rev 20915)
@@ -38,7 +38,7 @@
dcech#phpwerx.net and richtl#arscognita.com.</p>
<p>Currently the following databases are supported:</p>
<p> <b>Well-tested:</b> PostgreSQL, MySQL, Oracle, MSSQL.<br>
-<b>Beta-quality:</b> DB2, Informix, Sybase, Interbase, Firebird.<br>
+<b>Beta-quality:</b> DB2, Informix, Sybase, Interbase, Firebird, SQLite.<br>
<b>Alpha-quality:</b> MS Access (does not support DEFAULT values) and
generic ODBC.
</p>
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-access.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-access.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-access.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado5.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado5.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado5.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -640,6 +640,10 @@
case 1: // null
$this->fields[] = false;
break;
+ case 20:
+ case 21: // bigint (64 bit)
+ $this->fields[] = (float) $f->value; // if 64 bit PHP, could use (int)
+ break;
case 6: // currency is not supported properly;
ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
$this->fields[] = (float) $f->value;
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_access.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_access.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_mssql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ado_mssql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-borland_ibase.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-borland_ibase.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-csv.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-csv.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-csv.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -24,6 +24,9 @@
--------------------------------------------------------------------------------------*/
+
+
+
class ADODB_db2 extends ADOConnection {
var $databaseType = "db2";
var $fmtDate = "'Y-m-d'";
@@ -52,6 +55,7 @@
var $uCaseTables = true; // for meta* functions, uppercase table names
var $hasInsertID = true;
+
function _insertid()
{
return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
@@ -75,10 +79,14 @@
// Replaces the odbc_binmode() call that was in Execute()
ini_set('ibm_db2.binmode', $this->binmode);
- if ($argDatabasename) {
- $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
+ if ($argDatabasename && empty($argDSN)) {
+
+ if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null);
+ else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
} else {
- $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
+ if ($argDatabasename) $schema = $argDatabasename;
+ if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_connect($argDSN,null,null);
+ else $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
}
if (isset($php_errormsg)) $php_errormsg = '';
@@ -86,9 +94,9 @@
// an array of valid options. So far, we don't use them.
$this->_errorMsg = @db2_conn_errormsg();
-
if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+ if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
return $this->_connectionID != false;
}
@@ -106,10 +114,14 @@
if (isset($php_errormsg)) $php_errormsg = '';
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
- if ($argDatabasename) {
- $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
+ if ($argDatabasename && empty($argDSN)) {
+
+ if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null);
+ else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
} else {
- $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
+ if ($argDatabasename) $schema = $argDatabasename;
+ if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_pconnect($argDSN,null,null);
+ else $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
}
if (isset($php_errormsg)) $php_errormsg = '';
@@ -117,6 +129,7 @@
if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID);
if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+ if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
return $this->_connectionID != false;
}
@@ -224,7 +237,6 @@
}
}
-
function CreateSequence($seqname='adodbseq',$start=1)
{
if (empty($this->_genSeqSQL)) return false;
@@ -239,6 +251,25 @@
return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
}
+ function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
+ {
+ $nrows = (integer) $nrows;
+ if ($offset <= 0) {
+ // could also use " OPTIMIZE FOR $nrows ROWS "
+ if ($nrows >= 0) $sql .= " FETCH FIRST $nrows ROWS ONLY ";
+ $rs = $this->Execute($sql,$inputArr);
+ } else {
+ if ($offset > 0 && $nrows < 0);
+ else {
+ $nrows += $offset;
+ $sql .= " FETCH FIRST $nrows ROWS ONLY ";
+ }
+ $rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
+ }
+
+ return $rs;
+ }
+
/*
This algorithm is not very efficient, but works even if table locking
is not available.
@@ -407,7 +438,6 @@
}
$arr = $rs->GetArray();
-
$rs->Close();
$arr2 = array();
@@ -417,12 +447,13 @@
for ($i=0; $i < sizeof($arr); $i++) {
if (!$arr[$i][2]) continue;
$type = $arr[$i][3];
+ $owner = $arr[$i][1];
$schemaval = ($schema) ? $arr[$i][1].'.' : '';
if ($ttype) {
if ($isview) {
if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
+ } else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
+ } else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
}
return $arr2;
}
@@ -591,6 +622,7 @@
return $retarr;
}
+
function Prepare($sql)
{
if (! $this->_bindInputArray) return $sql; // no binding
Added: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2oci.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2oci.inc.php (rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-db2oci.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -0,0 +1,230 @@
+<?php
+/*
+V5.10 10 Nov 2009 (c) 2000-2009 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.
+Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+include(ADODB_DIR."/drivers/adodb-db2.inc.php");
+
+
+if (!defined('ADODB_DB2OCI')){
+define('ADODB_DB2OCI',1);
+
+/*
+// regex code for smart remapping of :0, :1 bind vars to ? ?
+function _colontrack($p)
+{
+global $_COLONARR,$_COLONSZ;
+ $v = (integer) substr($p,1);
+ if ($v > $_COLONSZ) return $p;
+ $_COLONARR[] = $v;
+ return '?';
+}
+
+// smart remapping of :0, :1 bind vars to ? ?
+function _colonscope($sql,$arr)
+{
+global $_COLONARR,$_COLONSZ;
+
+ $_COLONARR = array();
+ $_COLONSZ = sizeof($arr);
+
+ $sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
+
+ if (empty($_COLONARR)) return array($sql,$arr);
+
+ foreach($_COLONARR as $k => $v) {
+ $arr2[] = $arr[$v];
+ }
+
+ return array($sql2,$arr2);
+}
+*/
+
+/*
+ Smart remapping of :0, :1 bind vars to ? ?
+
+ Handles colons in comments -- and / * * / and in quoted strings.
+*/
+
+function _colonparser($sql,$arr)
+{
+ $lensql = strlen($sql);
+ $arrsize = sizeof($arr);
+ $state = 'NORM';
+ $at = 1;
+ $ch = $sql[0];
+ $ch2 = @$sql[1];
+ $sql2 = '';
+ $arr2 = array();
+ $nprev = 0;
+
+
+ while (strlen($ch)) {
+
+ switch($ch) {
+ case '/':
+ if ($state == 'NORM' && $ch2 == '*') {
+ $state = 'COMMENT';
+
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+ break;
+
+ case '*':
+ if ($state == 'COMMENT' && $ch2 == '/') {
+ $state = 'NORM';
+
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+ break;
+
+ case "\n":
+ case "\r":
+ if ($state == 'COMMENT2') $state = 'NORM';
+ break;
+
+ case "'":
+ do {
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ } while ($ch !== "'");
+ break;
+
+ case ':':
+ if ($state == 'COMMENT' || $state == 'COMMENT2') break;
+
+ //echo "$at=$ch $ch2, ";
+ if ('0' <= $ch2 && $ch2 <= '9') {
+ $n = '';
+ $nat = $at;
+ do {
+ $at += 1;
+ $ch = $ch2;
+ $n .= $ch;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ } while ('0' <= $ch && $ch <= '9');
+ #echo "$n $arrsize ] ";
+ $n = (integer) $n;
+ if ($n < $arrsize) {
+ $sql2 .= substr($sql,$nprev,$nat-$nprev-1).'?';
+ $nprev = $at-1;
+ $arr2[] = $arr[$n];
+ }
+ }
+ break;
+
+ case '-':
+ if ($state == 'NORM') {
+ if ($ch2 == '-') $state = 'COMMENT2';
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+ break;
+ }
+
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+
+ if ($nprev == 0) {
+ $sql2 = $sql;
+ } else {
+ $sql2 .= substr($sql,$nprev);
+ }
+
+ return array($sql2,$arr2);
+}
+
+class ADODB_db2oci extends ADODB_db2 {
+ var $databaseType = "db2oci";
+ var $sysTimeStamp = 'sysdate';
+ var $sysDate = 'trunc(sysdate)';
+ var $_bindInputArray = true;
+
+ function ADODB_db2oci()
+ {
+ parent::ADODB_db2();
+ }
+
+ function Param($name,$type=false)
+ {
+ return ':'.$name;
+ }
+
+
+ function MetaTables($ttype=false,$schema=false)
+ {
+ global $ADODB_FETCH_MODE;
+
+ $savem = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ $qid = db2_tables($this->_connectionID);
+
+ $rs = new ADORecordSet_db2($qid);
+
+ $ADODB_FETCH_MODE = $savem;
+ if (!$rs) {
+ $false = false;
+ return $false;
+ }
+
+ $arr = $rs->GetArray();
+ $rs->Close();
+ $arr2 = array();
+ // adodb_pr($arr);
+ if ($ttype) {
+ $isview = strncmp($ttype,'V',1) === 0;
+ }
+ for ($i=0; $i < sizeof($arr); $i++) {
+ if (!$arr[$i][2]) continue;
+ $type = $arr[$i][3];
+ $schemaval = ($schema) ? $arr[$i][1].'.' : '';
+ $name = $schemaval.$arr[$i][2];
+ $owner = $arr[$i][1];
+ if (substr($name,0,8) == 'EXPLAIN_') continue;
+ if ($ttype) {
+ if ($isview) {
+ if (strncmp($type,'V',1) === 0) $arr2[] = $name;
+ } else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name;
+ } else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name;
+ }
+ return $arr2;
+ }
+
+ function _Execute($sql, $inputarr=false )
+ {
+ if ($inputarr) list($sql,$inputarr) = _colonparser($sql, $inputarr);
+ return parent::_Execute($sql, $inputarr);
+ }
+};
+
+
+class ADORecordSet_db2oci extends ADORecordSet_db2 {
+
+ var $databaseType = "db2oci";
+
+ function ADORecordSet_db2oci($id,$mode=false)
+ {
+ return $this->ADORecordSet_db2($id,$mode);
+ }
+}
+
+} //define
+?>
\ No newline at end of file
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-firebird.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-firebird.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ibase.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ibase.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -242,7 +242,7 @@
// See http://community.borland.com/article/0,1410,25844,00.html
- function RowLock($tables,$where,$col)
+ function RowLock($tables,$where,$col=false)
{
if ($this->autoCommit) $this->BeginTrans();
$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-informix72.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-informix72.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim. All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -123,10 +123,10 @@
return true;
}
- function RowLock($tables,$where,$flds='1 as ignore')
+ function RowLock($tables,$where,$col='1 as ignore')
{
if ($this->_autocommit) $this->BeginTrans();
- return $this->GetOne("select $flds from $tables where $where for update");
+ return $this->GetOne("select $col from $tables where $where for update");
}
/* Returns: the last error message from previous database operation
@@ -369,7 +369,7 @@
foreach($fp as $k => $v) {
$o = new ADOFieldObject;
$o->name = $k;
- $arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
+ $arr = explode(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
$o->type = $arr[0];
$o->max_length = $arr[1];
$this->_fieldprops[] = $o;
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ldap.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-ldap.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -61,7 +61,7 @@
$conn_info = array( $host,$this->port);
if ( strstr( $host, ':' ) ) {
- $conn_info = split( ':', $host );
+ $conn_info = explode( ':', $host );
}
$this->_connectionID = @ldap_connect( $conn_info[0], $conn_info[1] );
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -366,10 +366,10 @@
See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
*/
- function RowLock($tables,$where,$flds='top 1 null as ignore')
+ function RowLock($tables,$where,$col='top 1 null as ignore')
{
if (!$this->transCnt) $this->BeginTrans();
- return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
+ return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
}
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssqlnative.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mssqlnative.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -330,10 +330,10 @@
See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
*/
- function RowLock($tables,$where,$flds='top 1 null as ignore')
+ function RowLock($tables,$where,$col='top 1 null as ignore')
{
if (!$this->transCnt) $this->BeginTrans();
- return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
+ return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
}
function SelectDB($dbName)
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqli.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqli.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -51,6 +51,7 @@
var $nameQuote = '`'; /// string to use to quote identifiers and names
var $optionFlags = array(array(MYSQLI_READ_DEFAULT_GROUP,0));
var $arrayClass = 'ADORecordSet_array_mysqli';
+ var $multiQuery = false;
function ADODB_mysqli()
{
@@ -194,11 +195,11 @@
return true;
}
- function RowLock($tables,$where='',$flds='1 as adodb_ignore')
+ function RowLock($tables,$where='',$col='1 as adodb_ignore')
{
if ($this->transCnt==0) $this->BeginTrans();
if ($where) $where = ' where '.$where;
- $rs = $this->Execute("select $flds from $tables $where for update");
+ $rs = $this->Execute("select $col from $tables $where for update");
return !empty($rs);
}
@@ -684,15 +685,23 @@
return $mysql_res;
*/
- if( $rs = mysqli_multi_query($this->_connectionID, $sql.';') )//Contributed by "Geisel Sierote" <geisel#4up.com.br>
- {
+ if ($this->multiQuery) {
+ $rs = mysqli_multi_query($this->_connectionID, $sql.';');
+ if ($rs) {
$rs = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->_connectionID ) : @mysqli_use_result( $this->_connectionID );
return $rs ? $rs : true; // mysqli_more_results( $this->_connectionID )
+ }
} else {
+ $rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
+
+ if ($rs) return $rs;
+ }
+
if($this->debug)
ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
+
return false;
- }
+
}
/* Returns: the last error message from previous database operation */
@@ -947,6 +956,19 @@
function _close()
{
+ //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
+ //only a problem with persistant connections
+
+ //mysqli_next_result($this->connection->_connectionID); trashes the DB side attached results.
+
+ while(mysqli_more_results($this->connection->_connectionID)){
+ @mysqli_next_result($this->connection->_connectionID);
+ }
+
+ //Because you can have one attached result, without tripping mysqli_more_results
+ @mysqli_next_result($this->connection->_connectionID);
+
+
mysqli_free_result($this->_queryID);
$this->_queryID = false;
}
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlpo.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlpo.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlpo.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -59,11 +59,11 @@
return true;
}
- function RowLock($tables,$where='',$flds='1 as adodb_ignore')
+ function RowLock($tables,$where='',$col='1 as adodb_ignore')
{
if ($this->transCnt==0) $this->BeginTrans();
if ($where) $where = ' where '.$where;
- $rs = $this->Execute("select $flds from $tables $where for update");
+ $rs = $this->Execute("select $col from $tables $where for update");
return !empty($rs);
}
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlt.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-mysqlt.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -76,11 +76,11 @@
return $ok ? true : false;
}
- function RowLock($tables,$where='',$flds='1 as adodb_ignore')
+ function RowLock($tables,$where='',$col='1 as adodb_ignore')
{
if ($this->transCnt==0) $this->BeginTrans();
if ($where) $where = ' where '.$where;
- $rs = $this->Execute("select $flds from $tables $where for update");
+ $rs = $this->Execute("select $col from $tables $where for update");
return !empty($rs);
}
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-netezza.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-netezza.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
Based on the previous postgres drivers.
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -322,10 +322,10 @@
return 'TO_DATE('.$tss.",'RRRR-MM-DD, HH24:MI:SS')";
}
- function RowLock($tables,$where,$flds='1 as ignore')
+ function RowLock($tables,$where,$col='1 as ignore')
{
if ($this->autoCommit) $this->BeginTrans();
- return $this->GetOne("select $flds from $tables where $where for update");
+ return $this->GetOne("select $col from $tables where $where for update");
}
function MetaTables($ttype=false,$showSchema=false,$mask=false)
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8po.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oci8po.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim. All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_db2.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_db2.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_db2.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -134,10 +134,10 @@
return $this->GetOne($this->identitySQL);
}
- function RowLock($tables,$where,$flds='1 as ignore')
+ function RowLock($tables,$where,$col='1 as ignore')
{
if ($this->_autocommit) $this->BeginTrans();
- return $this->GetOne("select $flds from $tables where $where for update");
+ return $this->GetOne("select $col from $tables where $where for update");
}
function MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_mssql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_mssql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_oracle.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbc_oracle.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp_unicode.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-odbtp_unicode.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oracle.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-oracle.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mssql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mssql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mssql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mysql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mysql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_mysql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_oci.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_oci.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_oci.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_pgsql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_pgsql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_sqlite.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-pdo_sqlite.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -27,12 +27,13 @@
var $_dropSeqSQL = 'DROP TABLE %s';
var $concat_operator = '||';
var $pdoDriver = false;
+ var $random='abs(random())';
function _init($parentDriver)
{
$this->pdoDriver = $parentDriver;
$parentDriver->_bindInputArray = true;
- $parentDriver->hasTransactions = true;
+ $parentDriver->hasTransactions = false; // // should be set to false because of PDO SQLite driver not supporting changing autocommit mode
$parentDriver->hasInsertID = true;
}
@@ -40,7 +41,7 @@
{
$parent = $this->pdoDriver;
@($ver = array_pop($parent->GetCol("SELECT sqlite_version()")));
- @($end = array_pop($parent->GetCol("PRAGMA encoding")));
+ @($enc = array_pop($parent->GetCol("PRAGMA encoding")));
$arr['version'] = $ver;
$arr['description'] = 'SQLite ';
@@ -184,7 +185,19 @@
function MetaTables($ttype=false,$showSchema=false,$mask=false)
{
$parent = $this->pdoDriver;
- return $parent->GetCol($this->metaTablesSQL);
+
+ if ($mask) {
+ $save = $this->metaTablesSQL;
+ $mask = $this->qstr(strtoupper($mask));
+ $this->metaTablesSQL .= " AND name LIKE $mask";
+ }
+
+ $ret = $parent->GetCol($this->metaTablesSQL);
+
+ if ($mask) {
+ $this->metaTablesSQL = $save;
+ }
+ return $ret;
}
}
?>
\ No newline at end of file
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres64.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres64.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -178,10 +178,10 @@
return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
}
- function RowLock($tables,$where,$flds='1 as ignore')
+ function RowLock($tables,$where,$col='1 as ignore')
{
if (!$this->transCnt) $this->BeginTrans();
- return $this->GetOne("select $flds from $tables where $where for update");
+ return $this->GetOne("select $col from $tables where $where for update");
}
// returns true/false.
@@ -665,7 +665,7 @@
if (strlen($db) == 0) $db = 'template1';
$db = adodb_addslashes($db);
if ($str) {
- $host = split(":", $str);
+ $host = explode(":", $str);
if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
else $str = '';
if (isset($host[1])) $str .= " port=$host[1]";
@@ -1056,7 +1056,7 @@
case 'INT4':
case 'INT2':
if (isset($fieldobj) &&
- empty($fieldobj->primary_key) && (!$this->uniqueIisR || empty($fieldobj->unique))) return 'I';
+ empty($fieldobj->primary_key) && (!$this->connection->uniqueIisR || empty($fieldobj->unique))) return 'I';
case 'OID':
case 'SERIAL':
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres7.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres7.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres8.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres8.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-postgres8.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-proxy.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-proxy.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sapdb.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sapdb.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlite.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlite.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlitepo.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlitepo.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sqlitepo.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim. All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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.
@@ -86,11 +86,11 @@
}
// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
- function RowLock($tables,$where,$flds='top 1 null as ignore')
+ function RowLock($tables,$where,$col='top 1 null as ignore')
{
if (!$this->_hastrans) $this->BeginTrans();
$tables = str_replace(',',' HOLDLOCK,',$tables);
- return $this->GetOne("select $flds from $tables HOLDLOCK where $where");
+ return $this->GetOne("select $col from $tables HOLDLOCK where $where");
}
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase_ase.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase_ase.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-sybase_ase.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
- V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+ V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-vfp.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/drivers/adodb-vfp.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/pear/Auth/Container/ADOdb.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/pear/Auth/Container/ADOdb.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/pear/Auth/Container/ADOdb.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,24 +1,16 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | [email protected] so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Authors: Martin Jansen <[email protected]>
-// | Richard Tango-Lowy <[email protected]> |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-//
+/*
+V5.10 10 Nov 2009 (c) 2000-2009 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.
+ Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Original Authors: Martin Jansen <mj#php.net>
+ Richard Tango-Lowy <richtl#arscognita.com>
+*/
require_once 'Auth/Container.php';
require_once 'adodb.inc.php';
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-db2.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-db2.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-db2.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-informix.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-informix.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-informix.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssqlnative.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssqlnative.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mssqlnative.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mysql.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mysql.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-mysql.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-oci8.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-oci8.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-oci8.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-postgres.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-postgres.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/perf/perf-postgres.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-bzip2.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-bzip2.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-bzip2.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-gzip.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-gzip.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-compress-gzip.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession2.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession2.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-cryptsession2.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-mcrypt.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-mcrypt.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-mcrypt.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-md5.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-md5.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-md5.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-secret.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-secret.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-encrypt-secret.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,7 +1,7 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob2.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob2.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session-clob2.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session2.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session2.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/adodb-session2.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -2,7 +2,7 @@
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Contributed by Ross Smith ([email protected]).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/old/adodb-cryptsession.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/old/adodb-cryptsession.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/session/old/adodb-cryptsession.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -1,6 +1,6 @@
<?php
/*
-V5.09 25 June 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
+V5.10 10 Nov 2009 (c) 2000-2009 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: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test-active-record.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test-active-record.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test-active-record.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -35,7 +35,7 @@
) ENGINE=MyISAM;
");
- class Person extends ADOdb_Active_Record{}
+ class Person extends ADOdb_Active_Record{ function ret($v) {return $v;} }
$person = new Person();
ADOdb_Active_Record::$_quoteNames = '111';
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/test.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -596,7 +596,7 @@
} else {
print "<b>Error in using Cursor Variables 1</b><p>";
}
- $rs->Close();
+ if ($rs) $rs->Close();
print "<h4>Testing Stored Procedures for oci8</h4>";
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/testdatabases.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/testdatabases.inc.php 2010-01-05 17:56:54 UTC (rev 20914)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/adodb/tests/testdatabases.inc.php 2010-01-05 20:55:35 UTC (rev 20915)
@@ -60,9 +60,11 @@
ADOLoadCode2("firebird");
ADOLoadCode2("borland_ibase");
ADOLoadCode2("informix");
- ADOLoadCode2("sqlanywhere");
ADOLoadCode2('mysqli');
+ if (defined('ODBC_BINMODE_RETURN')) {
+ ADOLoadCode2("sqlanywhere");
ADOLoadCode2("access");
+ }
ADOLoadCode2("mysql");
ADOLoadCode2("oci8");
}
@@ -311,7 +313,7 @@
//$db->debug=1;
print "<h1>Connecting $db->databaseType...</h1>";
- if ($db->Connect('', "scott", "natsoft",'condor'))
+ if ($db->Connect('192.168.0.138', "scott", "natsoft",'SID=natsoft'))
testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
else
print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'<BR>'.$db->ErrorMsg();