[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/adodb adodb-active-record.inc.php ...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/adodb adodb-active-record.inc.php ... |
|
Date: |
Tue, 13 Mar 2007 13:53:25 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Sigurd Nes <sigurdne> 07/03/13 13:53:24
Modified files:
inc/adodb : adodb-active-record.inc.php
adodb-csvlib.inc.php adodb-datadict.inc.php
adodb-error.inc.php adodb-errorhandler.inc.php
adodb-errorpear.inc.php
adodb-exceptions.inc.php adodb-iterator.inc.php
adodb-lib.inc.php adodb-memcache.lib.inc.php
adodb-pager.inc.php adodb-pear.inc.php
adodb-perf.inc.php adodb-php4.inc.php
adodb-xmlschema.inc.php
adodb-xmlschema03.inc.php adodb.inc.php
pivottable.inc.php rsfilter.inc.php server.php
toexport.inc.php tohtml.inc.php
inc/adodb/datadict: datadict-access.inc.php datadict-db2.inc.php
datadict-firebird.inc.php
datadict-generic.inc.php
datadict-ibase.inc.php
datadict-informix.inc.php
datadict-mssql.inc.php
datadict-mysql.inc.php datadict-oci8.inc.php
datadict-postgres.inc.php
datadict-sapdb.inc.php
datadict-sybase.inc.php
inc/adodb/docs : docs-active-record.htm docs-adodb.htm
docs-datadict.htm docs-perf.htm
docs-session.htm docs-session.old.htm
inc/adodb/drivers: adodb-access.inc.php adodb-ado.inc.php
adodb-ado5.inc.php adodb-ado_access.inc.php
adodb-ado_mssql.inc.php
adodb-borland_ibase.inc.php adodb-csv.inc.php
adodb-db2.inc.php adodb-fbsql.inc.php
adodb-firebird.inc.php adodb-ibase.inc.php
adodb-informix.inc.php
adodb-informix72.inc.php adodb-ldap.inc.php
adodb-mssql.inc.php adodb-mssqlpo.inc.php
adodb-mysql.inc.php adodb-mysqli.inc.php
adodb-mysqlt.inc.php adodb-netezza.inc.php
adodb-oci8.inc.php adodb-oci805.inc.php
adodb-oci8po.inc.php adodb-odbc.inc.php
adodb-odbc_db2.inc.php
adodb-odbc_mssql.inc.php
adodb-odbc_oracle.inc.php adodb-odbtp.inc.php
adodb-odbtp_unicode.inc.php
adodb-oracle.inc.php adodb-pdo.inc.php
adodb-pdo_mssql.inc.php
adodb-pdo_mysql.inc.php adodb-pdo_oci.inc.php
adodb-pdo_pgsql.inc.php
adodb-postgres.inc.php
adodb-postgres64.inc.php
adodb-postgres7.inc.php
adodb-postgres8.inc.php adodb-proxy.inc.php
adodb-sapdb.inc.php adodb-sqlanywhere.inc.php
adodb-sqlite.inc.php adodb-sqlitepo.inc.php
adodb-sybase.inc.php adodb-sybase_ase.inc.php
adodb-vfp.inc.php
inc/adodb/pear/Auth/Container: ADOdb.php
inc/adodb/perf : perf-db2.inc.php perf-informix.inc.php
perf-mssql.inc.php perf-mysql.inc.php
perf-oci8.inc.php perf-postgres.inc.php
inc/adodb/session: adodb-compress-bzip2.php
adodb-compress-gzip.php
adodb-cryptsession.php
adodb-cryptsession2.php
adodb-encrypt-mcrypt.php
adodb-encrypt-md5.php
adodb-encrypt-secret.php
adodb-session-clob.php
adodb-session-clob2.php adodb-session.php
adodb-session2.php adodb-sessions.mysql.sql
adodb-sessions.oracle.clob.sql
adodb-sessions.oracle.sql
inc/adodb/session/old: adodb-cryptsession.php
adodb-session-clob.php adodb-session.php
inc/adodb/tests: benchmark.php test-datadict.php test-php5.php
test.php test3.php test4.php test5.php
testcache.php testdatabases.inc.php
testmssql.php testoci8.php testoci8cursor.php
testpaging.php testpear.php testsessions.php
Added files:
inc/adodb/drivers: adodb-mssql_n.inc.php
Log message:
update to release 494
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-active-record.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-csvlib.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-datadict.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-error.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-errorhandler.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-errorpear.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-exceptions.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-iterator.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-lib.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php?cvsroot=phpgwapi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-pager.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-pear.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-perf.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-php4.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-xmlschema.inc.php?cvsroot=phpgwapi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/adodb.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/pivottable.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/rsfilter.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/server.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/toexport.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tohtml.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-access.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/docs/docs-active-record.htm?cvsroot=phpgwapi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/docs/docs-adodb.htm?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/docs/docs-datadict.htm?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/docs/docs-perf.htm?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/docs/docs-session.htm?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/docs/docs-session.old.htm?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-access.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/drivers/adodb-mssql_n.inc.php?cvsroot=phpgwapi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/perf/perf-db2.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/perf/perf-informix.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/perf/perf-mssql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/perf/perf-mysql.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/perf/perf-oci8.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/perf/perf-postgres.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-compress-gzip.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-cryptsession.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-cryptsession2.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-session-clob.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-session-clob2.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-session.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-session2.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql?cvsroot=phpgwapi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql?cvsroot=phpgwapi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql?cvsroot=phpgwapi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/old/adodb-session-clob.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/session/old/adodb-session.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/benchmark.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/test-datadict.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/test-php5.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/test.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/test3.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/test4.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/test5.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testcache.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testdatabases.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testmssql.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testoci8.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testoci8cursor.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testpaging.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testpear.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/adodb/tests/testsessions.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
Patches:
Index: adodb-active-record.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-active-record.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- adodb-active-record.inc.php 10 Oct 2006 10:44:42 -0000 1.4
+++ adodb-active-record.inc.php 13 Mar 2007 13:53:22 -0000 1.5
@@ -1,7 +1,7 @@
<?php
/*
address@hidden V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
address@hidden V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
Latest version is available at http://adodb.sourceforge.net
Released under both BSD license and Lesser GPL library license.
@@ -10,7 +10,7 @@
Active Record implementation. Superset of Zend Framework's.
- Version 0.04
+ Version 0.07
See
http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
for info on Ruby on Rails Active Record implementation
@@ -42,9 +42,9 @@
foreach($_ADODB_ACTIVE_DBS as $k => $d) {
if (PHP_VERSION >= 5) {
- if ($d->db == $db) return $k;
+ if ($d->db === $db) return $k;
} else {
- if ($d->db->_connectionID == $db->_connectionID
&& $db->database == $d->db->database)
+ if ($d->db->_connectionID ===
$db->_connectionID && $db->database == $d->db->database)
return $k;
}
}
@@ -223,7 +223,7 @@
break;
default:
foreach($cols as $name => $fldobj) {
- $name = ($fldobj->$name);
+ $name = ($fldobj->name);
$this->$name = null;
$attr[$name] = $fldobj;
}
@@ -285,6 +285,15 @@
return $this->_lasterr;
}
+ function ErrorNo()
+ {
+ if ($this->_dbat < 0) return -9999; // no database connection...
+ $db = $this->DB();
+
+ return (int) $db->ErrorNo();
+ }
+
+
// retrieve ADOConnection from _ADODB_Active_DBs
function &DB()
{
Index: adodb-csvlib.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-csvlib.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-csvlib.inc.php 10 Oct 2006 10:44:42 -0000 1.7
+++ adodb-csvlib.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -8,7 +8,7 @@
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: adodb-datadict.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-datadict.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-datadict.inc.php 10 Oct 2006 10:44:42 -0000 1.7
+++ adodb-datadict.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -277,7 +277,7 @@
return $rez;
}
- /*
+ /**
Returns the actual type given a character code.
C: varchar
@@ -344,11 +344,19 @@
{
$tabname = $this->TableName ($tabname);
$sql = array();
- list($lines,$pkey) = $this->_GenFields($flds);
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
foreach($lines as $v) {
$sql[] = $alter . $v;
}
+ if (is_array($idxs)) {
+ foreach($idxs as $idx => $idxdef) {
+ $sql_idxs = $this->CreateIndexSql($idx,
$tabname, $idxdef['cols'], $idxdef['opts']);
+ $sql = array_merge($sql, $sql_idxs);
+ }
+ }
return $sql;
}
@@ -367,11 +375,20 @@
{
$tabname = $this->TableName ($tabname);
$sql = array();
- list($lines,$pkey) = $this->_GenFields($flds);
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
foreach($lines as $v) {
$sql[] = $alter . $v;
}
+ if (is_array($idxs)) {
+ foreach($idxs as $idx => $idxdef) {
+ $sql_idxs = $this->CreateIndexSql($idx,
$tabname, $idxdef['cols'], $idxdef['opts']);
+ $sql = array_merge($sql, $sql_idxs);
+ }
+
+ }
return $sql;
}
@@ -389,7 +406,9 @@
{
$tabname = $this->TableName ($tabname);
if ($flds) {
- list($lines,$pkey) = $this->_GenFields($flds);
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
list(,$first) = each($lines);
list(,$column_def) = split("[\t ]+",$first,2);
}
@@ -429,22 +448,36 @@
return array (sprintf($this->renameTable,
$this->TableName($tabname),$this->TableName($newname)));
}
- /*
+ /**
Generate the SQL to create table. Returns an array of sql strings.
*/
- function CreateTableSQL($tabname, $flds, $tableoptions=false)
+ function CreateTableSQL($tabname, $flds, $tableoptions=array())
{
- if (!$tableoptions) $tableoptions = array();
-
- list($lines,$pkey) = $this->_GenFields($flds, true);
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds, true);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
$taboptions = $this->_Options($tableoptions);
$tabname = $this->TableName ($tabname);
$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
+ // ggiunta - 2006/10/12 - KLUDGE:
+ // if we are on autoincrement, and table options includes REPLACE, the
+ // autoincrement sequence has already been dropped on table creation
sql, so
+ // we avoid passing REPLACE to trigger creation code. This prevents
+ // creating sql that double-drops the sequence
+ if ($this->autoIncrement && isset($taboptions['REPLACE']))
+ unset($taboptions['REPLACE']);
$tsql = $this->_Triggers($tabname,$taboptions);
foreach($tsql as $s) $sql[] = $s;
+ if (is_array($idxs)) {
+ foreach($idxs as $idx => $idxdef) {
+ $sql_idxs = $this->CreateIndexSql($idx,
$tabname, $idxdef['cols'], $idxdef['opts']);
+ $sql = array_merge($sql, $sql_idxs);
+ }
+ }
+
return $sql;
}
@@ -460,6 +493,9 @@
$f1 = array();
foreach($f0 as $token) {
switch (strtoupper($token)) {
+ case 'INDEX':
+ $f1['INDEX'] = '';
+ // fall through intentionally
case 'CONSTRAINT':
case 'DEFAULT':
$hasparam = $token;
@@ -471,6 +507,20 @@
break;
}
}
+ // 'index' token without a name means single
column index: name it after column
+ if (array_key_exists('INDEX', $f1) &&
$f1['INDEX'] == '') {
+ $f1['INDEX'] = isset($f0['NAME']) ?
$f0['NAME'] : $f0[0];
+ // check if column name used to create
an index name was quoted
+ if (($f1['INDEX'][0] == '"' ||
$f1['INDEX'][0] == "'" || $f1['INDEX'][0] == "`") &&
+ ($f1['INDEX'][0] ==
substr($f1['INDEX'], -1))) {
+ $f1['INDEX'] =
$f1['INDEX'][0].'idx_'.substr($f1['INDEX'], 1, -1).$f1['INDEX'][0];
+ }
+ else
+ $f1['INDEX'] =
'idx_'.$f1['INDEX'];
+ }
+ // reset it, so we don't get next field 1st
token as INDEX...
+ $hasparam = false;
+
$flds[] = $f1;
}
@@ -478,6 +528,7 @@
$this->autoIncrement = false;
$lines = array();
$pkey = array();
+ $idxs = array();
foreach($flds as $fld) {
$fld = _array_change_key_case($fld);
@@ -494,6 +545,8 @@
$fconstraint = false;
$fnotnull = false;
$funsigned = false;
+ $findex = '';
+ $funiqueindex = false;
//-----------------
// Parse attributes
@@ -519,7 +572,8 @@
case 'AUTOINCREMENT':
case 'AUTO': $fautoinc = true; $fnotnull =
true; break;
case 'KEY':
- case 'PRIMARY': $fprimary = $v; $fnotnull =
true; break;
+ // a primary key col can be non unique in itself (if key spans
many cols...)
+ case 'PRIMARY': $fprimary = $v; $fnotnull =
true; /*$funiqueindex = true;*/ break;
case 'DEF':
case 'DEFAULT': $fdefault = $v; break;
case 'NOTNULL': $fnotnull = $v; break;
@@ -527,6 +581,9 @@
case 'DEFDATE': $fdefdate = $v; break;
case 'DEFTIMESTAMP': $fdefts = $v; break;
case 'CONSTRAINT': $fconstraint = $v; break;
+ // let INDEX keyword create a 'very standard'
index on column
+ case 'INDEX': $findex = $v; break;
+ case 'UNIQUE': $funiqueindex = true; break;
} //switch
} // foreach $fld
@@ -556,6 +613,27 @@
// some databases do not allow blobs to have defaults
if ($ty == 'X') $fdefault = false;
+ // build list of indexes
+ if ($findex != '') {
+ if (array_key_exists($findex, $idxs)) {
+ $idxs[$findex]['cols'][] = ($fname);
+ if (in_array('UNIQUE',
$idxs[$findex]['opts']) != $funiqueindex) {
+ if ($this->debug)
ADOConnection::outp("Index $findex defined once UNIQUE and once not");
+ }
+ if ($funiqueindex &&
!in_array('UNIQUE', $idxs[$findex]['opts']))
+ $idxs[$findex]['opts'][] =
'UNIQUE';
+ }
+ else
+ {
+ $idxs[$findex] = array();
+ $idxs[$findex]['cols'] = array($fname);
+ if ($funiqueindex)
+ $idxs[$findex]['opts'] =
array('UNIQUE');
+ else
+ $idxs[$findex]['opts'] =
array();
+ }
+ }
+
//--------------------
// CONSTRUCT FIELD SQL
if ($fdefts) {
@@ -570,24 +648,47 @@
} else {
$fdefault = $this->connection->sysDate;
}
- } else if ($fdefault !== false && !$fnoquote)
+ } else if ($fdefault !== false && !$fnoquote) {
if ($ty == 'C' or $ty == 'X' or
- ( substr($fdefault,0,1) != "'" &&
!is_numeric($fdefault)))
+ ( substr($fdefault,0,1) != "'" &&
!is_numeric($fdefault))) {
+
+ if (($ty == 'D' || $ty == 'T') &&
strtolower($fdefault) != 'null') {
+ // convert default date into
database-aware code
+ if ($ty == 'T')
+ {
+ $fdefault =
$this->connection->DBTimeStamp($fdefault);
+ }
+ else
+ {
+ $fdefault =
$this->connection->DBDate($fdefault);
+ }
+ }
+ else
if (strlen($fdefault) != 1 &&
substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ')
$fdefault = trim($fdefault);
else if (strtolower($fdefault) !=
'null')
$fdefault =
$this->connection->qstr($fdefault);
+ }
+ }
$suffix =
$this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
+ // add index creation
if ($widespacing) $fname = str_pad($fname,24);
+
+ // check for field names appearing twice
+ if (array_key_exists($fid, $lines)) {
+ ADOConnection::outp("Field '$fname' defined twice");
+ }
+
$lines[$fid] = $fname.' '.$ftype.$suffix;
if ($fautoinc) $this->autoIncrement = true;
} // foreach $flds
- return array($lines,$pkey);
+ return array($lines,$pkey,$idxs);
}
- /*
+
+ /**
GENERATE THE SIZE PART OF THE DATATYPE
$ftype is the actual type
$ty is the type defined originally in the DDL
@@ -680,7 +781,7 @@
return $sql;
}
- /*
+ /**
GENERATE TRIGGERS IF NEEDED
used when table has auto-incrementing field that is emulated
using triggers
*/
@@ -689,7 +790,7 @@
return array();
}
- /*
+ /**
Sanitize options, so that array elements with no keys are
promoted to keys
*/
function _Options($opts)
@@ -703,7 +804,7 @@
return $newopts;
}
- /*
+ /**
"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
This function changes/adds new fields to your table. You don't
@@ -760,7 +861,9 @@
// already exists, alter table instead
- list($lines,$pkey) = $this->_GenFields($flds);
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
$alter = 'ALTER TABLE ' . $this->TableName($tablename);
$sql = array();
@@ -770,8 +873,10 @@
$flds = Lens_ParseArgs($v,',');
// We are trying to change the size of the
field, if not allowed, simply ignore the request.
- if ($flds &&
in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4))
continue;
-
+ if ($flds &&
in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) {
+ echo "<h3>$this->alterCol cannot be
changed to $flds currently</h3>";
+ continue;
+ }
$sql[] = $alter . $this->alterCol . ' ' . $v;
} else {
$sql[] = $alter . $this->addCol . ' ' . $v;
Index: adodb-error.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-error.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-error.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-error.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: adodb-errorhandler.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-errorhandler.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-errorhandler.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-errorhandler.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: adodb-errorpear.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-errorpear.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-errorpear.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-errorpear.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: adodb-exceptions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-exceptions.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-exceptions.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-exceptions.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: adodb-iterator.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-iterator.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-iterator.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-iterator.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: adodb-lib.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-lib.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-lib.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-lib.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -7,7 +7,7 @@
$ADODB_INCLUDED_LIB = 1;
/*
- @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (address@hidden). All
rights reserved.
+ @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (address@hidden). 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.
@@ -56,16 +56,17 @@
}
}
+
}
-function &adodb_transpose(&$arr, &$newarr, &$hdr)
+function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
{
$oldX = sizeof(reset($arr));
$oldY = sizeof($arr);
if ($hdr) {
$startx = 1;
- $hdr = array();
+ $hdr = array('Fields');
for ($y = 0; $y < $oldY; $y++) {
$hdr[] = $arr[$y][0];
}
@@ -73,7 +74,12 @@
$startx = 0;
for ($x = $startx; $x < $oldX; $x++) {
+ if ($fobjs) {
+ $o = $fobjs[$x];
+ $newarr[] = array($o->name);
+ } else
$newarr[] = array();
+
for ($y = 0; $y < $oldY; $y++) {
$newarr[$x-$startx][] = $arr[$y][$x];
}
@@ -560,6 +566,8 @@
function _adodb_getupdatesql(&$zthis,&$rs,
$arrFields,$forceUpdate=false,$magicq=false,$force=2)
{
+ global $ADODB_QUOTE_FIELDNAMES;
+
if (!$rs) {
printf(ADODB_BAD_RS,'GetUpdateSQL');
return false;
@@ -606,7 +614,7 @@
$type = 'C';
}
- if (strpos($upperfname,' ') !== false)
+ if ((strpos($upperfname,' ') !== false)
|| ($ADODB_QUOTE_FIELDNAMES))
$fnameq =
$zthis->nameQuote.$upperfname.$zthis->nameQuote;
else
$fnameq = $upperfname;
@@ -720,6 +728,7 @@
static $cacheRS = false;
static $cacheSig = 0;
static $cacheCols;
+ global $ADODB_QUOTE_FIELDNAMES;
$tableName = '';
$values = '';
@@ -769,7 +778,7 @@
$upperfname = strtoupper($field->name);
if (adodb_key_exists($upperfname,$arrFields,$force)) {
$bad = false;
- if (strpos($upperfname,' ') !== false)
+ if ((strpos($upperfname,' ') !== false) ||
($ADODB_QUOTE_FIELDNAMES))
$fnameq =
$zthis->nameQuote.$upperfname.$zthis->nameQuote;
else
$fnameq = $upperfname;
Index: adodb-memcache.lib.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- adodb-memcache.lib.inc.php 29 Aug 2006 08:00:49 -0000 1.1
+++ adodb-memcache.lib.inc.php 13 Mar 2007 13:53:22 -0000 1.2
@@ -8,7 +8,7 @@
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.90 8 June 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: adodb-pager.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-pager.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-pager.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-pager.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All
rights reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All
rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: adodb-pear.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-pear.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-pear.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-pear.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: adodb-perf.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-perf.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-perf.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-perf.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: adodb-php4.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-php4.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb-php4.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb-php4.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: adodb-xmlschema.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-xmlschema.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- adodb-xmlschema.inc.php 4 Nov 2006 14:52:41 -0000 1.8
+++ adodb-xmlschema.inc.php 13 Mar 2007 13:53:22 -0000 1.9
@@ -12,7 +12,7 @@
*
* Last Editor: $Author: sigurdne $
* @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*
* @package axmls
* @tutorial getting_started.pkg
@@ -1209,7 +1209,7 @@
* @tutorial getting_started.pkg
*
* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.8 $
+* @version $Revision: 1.9 $
*
* @package axmls
*/
Index: adodb-xmlschema03.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- adodb-xmlschema03.inc.php 4 Nov 2006 14:52:42 -0000 1.5
+++ adodb-xmlschema03.inc.php 13 Mar 2007 13:53:22 -0000 1.6
@@ -12,7 +12,7 @@
*
* Last Editor: $Author: sigurdne $
* @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
* @package axmls
* @tutorial getting_started.pkg
@@ -1309,7 +1309,7 @@
* @tutorial getting_started.pkg
*
* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.5 $
+* @version $Revision: 1.6 $
*
* @package axmls
*/
Index: adodb.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/adodb.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adodb.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ adodb.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -14,7 +14,7 @@
/**
\mainpage
- @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim
(jlim#natsoft.com.my). All rights reserved.
+ @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim
(jlim#natsoft.com.my). All rights reserved.
Released under both BSD license and Lesser GPL library license. You can
choose which license
you prefer.
@@ -56,7 +56,8 @@
$ADODB_CACHE_DIR, // directory to cache recordsets
$ADODB_EXTENSION, // ADODB extension installed
$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true,
$rs->fields is available on EOF
- $ADODB_FETCH_MODE; // DEFAULT, NUM, ASSOC or BOTH. Default
follows native driver default...
+ $ADODB_FETCH_MODE, // DEFAULT, NUM, ASSOC or BOTH. Default
follows native driver default...
+ $ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes
(backticks) around field names in queries generated by getinsertsql and
getupdatesql.
//==============================================================================================
// GLOBAL SETUP
@@ -152,7 +153,8 @@
$ADODB_COUNTRECS, // count number of records returned -
slows down query
$ADODB_CACHE_DIR, // directory to cache recordsets
$ADODB_FETCH_MODE,
- $ADODB_FORCE_TYPE;
+ $ADODB_FORCE_TYPE,
+ $ADODB_QUOTE_FIELDNAMES;
$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
@@ -174,7 +176,7 @@
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'V4.93 10 Oct 2006 (c) 2000-2006 John Lim
(jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+ $ADODB_vers = 'V4.94 23 Jan 2007 (c) 2000-2007 John Lim
(jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
/**
* Determines whether recordset->RecordCount() is used.
@@ -918,7 +920,7 @@
}
if ($this->_queryID === true) { // return simplified recordset
for inserts/updates/deletes with lower overhead
- $rs =& new ADORecordSet_empty();
+ $rs = new ADORecordSet_empty();
return $rs;
}
@@ -1363,13 +1365,13 @@
return $rv;
}
- function &Transpose(&$rs)
+ function &Transpose(&$rs,$addfieldnames=true)
{
$rs2 =& $this->_rs2rs($rs);
$false = false;
if (!$rs2) return $false;
- $rs2->_transpose();
+ $rs2->_transpose($addfieldnames);
return $rs2;
}
@@ -1993,7 +1995,7 @@
if (empty($this->_metars)) {
$rsclass = $this->rsPrefix.$this->databaseType;
- $this->_metars =& new $rsclass(false,$this->fetchMode);
+ $this->_metars = new $rsclass(false,$this->fetchMode);
$this->_metars->connection =& $this;
}
return $this->_metars->MetaType($t,$len,$fieldobj);
@@ -2019,6 +2021,7 @@
$this->fmtTimeStamp = "'m-d-Y H:i:s'";
break;
+ case 'PT_BR':
case 'NL':
case 'FR':
case 'RO':
@@ -2065,13 +2068,13 @@
$arr = array();
foreach($rows as $row) {
- $obj =& new $class($table,$primkeyArr,$this);
+ $obj = new $class($table,$primkeyArr,$this);
if ($obj->ErrorMsg()){
$this->_errorMsg = $obj->ErrorMsg();
return $false;
}
$obj->Set($row);
- $arr[] =& $obj;
+ $arr[] = $obj;
}
return $arr;
}
@@ -2097,7 +2100,11 @@
*
* @return true if succeeded or false if database does not support
transactions
*/
- function BeginTrans() {return false;}
+ function BeginTrans()
+ {
+ if ($this->debug) ADOConnection::outp("BeginTrans: Transactions
not supported for this driver");
+ return false;
+ }
/* set transaction mode */
function SetTransactionMode( $transaction_mode )
@@ -3387,9 +3394,12 @@
*
* @return the ADOFieldObject for that column, or false.
*/
- function &FetchField($fieldoffset)
+ function &FetchField($fieldoffset = -1)
{
// must be defined by child class
+
+ $false = false;
+ return $false;
}
/**
@@ -3734,14 +3744,15 @@
$this->fetchMode = $ADODB_FETCH_MODE;
}
- function _transpose()
+ function _transpose($addfieldnames=true)
{
global $ADODB_INCLUDED_LIB;
if (empty($ADODB_INCLUDED_LIB))
include(ADODB_DIR.'/adodb-lib.inc.php');
$hdr = true;
- adodb_transpose($this->_array, $newarr, $hdr);
+ $fobjs = $addfieldnames ? $this->_fieldobjects : false;
+ adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
//adodb_pr($newarr);
$this->_skiprow1 = false;
@@ -3758,7 +3769,6 @@
$f->type = $this->_types[$k];
$f->max_length = -1;
$this->_fieldobjects[] = $f;
-
}
$this->fields = reset($this->_array);
Index: pivottable.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/pivottable.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pivottable.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ pivottable.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: rsfilter.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/rsfilter.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- rsfilter.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ rsfilter.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: server.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/server.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server.php 10 Oct 2006 10:44:43 -0000 1.7
+++ server.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: toexport.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/toexport.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- toexport.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ toexport.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: tohtml.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tohtml.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tohtml.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ tohtml.inc.php 13 Mar 2007 13:53:22 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-access.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-access.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-access.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-access.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-db2.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-db2.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-db2.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-firebird.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-firebird.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-firebird.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-generic.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-generic.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-generic.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-ibase.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-ibase.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-ibase.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-informix.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-informix.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-informix.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-mssql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-mssql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-mssql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-mysql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-mysql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-mysql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-oci8.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-oci8.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-oci8.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -196,6 +196,14 @@
$seqname = $this->seqPrefix.$tabname;
$trigname = $this->trigPrefix.$seqname;
}
+
+ if (strlen($seqname) > 30) {
+ $seqname = $this->seqPrefix.uniqid('');
+ } // end if
+ if (strlen($trigname) > 30) {
+ $trigname = $this->trigPrefix.uniqid('');
+ } // end if
+
if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE
$seqname";
$seqCache = '';
if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache =
$tableoptions['SEQUENCE_CACHE'];}
Index: datadict/datadict-postgres.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-postgres.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-postgres.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-sapdb.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- datadict/datadict-sapdb.inc.php 22 Jun 2006 09:06:36 -0000 1.4
+++ datadict/datadict-sapdb.inc.php 13 Mar 2007 13:53:23 -0000 1.5
@@ -1,7 +1,7 @@
<?php
/**
- V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.50 6 July 2004 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: datadict/datadict-sybase.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- datadict/datadict-sybase.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ datadict/datadict-sybase.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/**
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: docs/docs-active-record.htm
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/docs/docs-active-record.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- docs/docs-active-record.htm 29 Aug 2006 08:00:49 -0000 1.3
+++ docs/docs-active-record.htm 13 Mar 2007 13:53:23 -0000 1.4
@@ -14,7 +14,7 @@
<title>ADOdb Active Record</title>
<body>
<h1>ADOdb Active Record</h1>
-<p> (c) 2000-2006 John Lim (jlim#natsoft.com)</p>
+<p> (c) 2000-2007 John Lim (jlim#natsoft.com)</p>
<p><font size="1">This software is dual licensed using BSD-Style and LGPL.
This
means you can use it in compiled proprietary and commercial
products.</font></p>
<p><hr>
@@ -414,6 +414,10 @@
</ol>
+<h3><li>ADOConnection::ErrorMsg()</h3>
+<p>Returns last error message.
+<h3><li>ADOConnection::ErrorNo()</h3>
+<p>Returns last error number.
<h2>Code Sample</h2>
<p>The following works with PHP4 and PHP5
<pre>
@@ -497,6 +501,14 @@
<p>PHP5 specific: Change PHP5 implementation of Active Record to use __get()
and __set() for better performance.
<h3> Change Log</h3>
+<p>0.07
+<p>$ADODB_ASSOC_CASE=2 did not work properly. Fixed.
+<p>Added === check in ADODB_SetDatabaseAdapter for $db,
adodb-active-record.inc.php. Thx Christian Affolter.
+
+<p>0.06
+<p>Added ErrorNo().
+<p>Fixed php 5.2.0 compat issues.
+
<p>0.05
<p>If inserting a record and the value of a primary key field is null, then we
do not insert that field in as
we assume it is an auto-increment field. Needed by mssql.
Index: docs/docs-adodb.htm
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/docs/docs-adodb.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- docs/docs-adodb.htm 10 Oct 2006 10:44:43 -0000 1.7
+++ docs/docs-adodb.htm 13 Mar 2007 13:53:23 -0000 1.8
@@ -15,7 +15,7 @@
<body bgcolor="#ffffff" text="black">
<h2>ADOdb Library for PHP</h2>
-<p>V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com)</p>
+<p>V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com)</p>
<p><font size="1">This software is dual licensed using BSD-Style and LGPL.
This
means you can use it in compiled proprietary and commercial
products.</font></p>
@@ -59,7 +59,7 @@
<a href="#adodb_cache_dir">$ADODB_CACHE_DIR</a> <br>
<a href="#force_type">$ADODB_FORCE_TYPE</a>
<a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>
- <a href="#adodb_lang">$ADODB_LANG</a> <br>
+ <a href="#adodb_lang">$ADODB_LANG</a> <a
href=#adodb_auto_quote>ADODB_QUOTE_FIELDNAMES</a> <br>
Constants: </font><font size="2"><a
href="#adodb_assoc_case">ADODB_ASSOC_CASE</a>
</font><br>
<a href="#ADOConnection"><b> ADOConnection</b></a><br>
@@ -79,7 +79,7 @@
(oci8 only)<br>
Generates SQL strings: <a href="#getupdatesql">GetUpdateSQL</a> <a
href="#getinsertsql">GetInsertSQL</a>
<a href="#concat">Concat</a> <a href="#ifnull">IfNull</a> <a
href="#length">length</a> <a href="#random">random</a> <a
href="#substr">substr</a>
- <a href="#qstr">qstr</a> <a href="#param">Param</a> <a
href="#OffsetDate">OffsetDate</a> <a href="#SQLDate">SQLDate</a>
+ <a href="#qstr">qstr</a> <a href="#param">Param</a> <a
href="#OffsetDate">OffsetDate</a> <a href="#sqldate">SQLDate</a>
<a href="#dbdate">DBDate</a> <a href="#dbtimestamp">DBTimeStamp</a>
<a href="#binddate">BindDate</a> <a href="#bindtimestamp">BindTimeStamp</a>
<br>
@@ -1516,9 +1516,8 @@
The recordset saves this value on creation (eg. in Execute( ) or
SelectLimit(
)), and any subsequent changes to $ADODB_FETCH_MODE have no affect on
existing
recordsets, only on recordsets created in the future.</font></p>
-<p><font>The following constants are defined:</font></p>
-
-<p><font>define('ADODB_FETCH_DEFAULT',0);<br>
+ <p><font>The following constants are defined:</font></p>
+ <p><font>define('ADODB_FETCH_DEFAULT',0);<br>
define('ADODB_FETCH_NUM',1);<br>
define('ADODB_FETCH_ASSOC',2);<br>
define('ADODB_FETCH_BOTH',3); </font></p>
@@ -1559,7 +1558,11 @@
include('adodb.inc.php'); </font></p>
<h3><font><a name="force_type"></a>$ADODB_FORCE_TYPE</font></h3>
<p><font>See the <a href="#ADODB_FORCE_TYPE">GetUpdateSQL tutorial</a>.
-</font></p><hr />
+</font></p>
+<h3><font><a name="adodb_auto_quote"></a>$ADODB_QUOTE_FIELDNAMES</font></h3>
+<p><font>Auto-quotes field names when using AutoExecute() when set to true.
</font>
+<p> </p>
+<hr />
<h2><font>ADOConnection<a name="adoconnection"></a></font></h2>
<p><font>Object that performs the connection to the database, executes SQL
statements
and has a set of utility functions for standardising the format of SQL
statements
@@ -1865,7 +1868,7 @@
If you do not pass in an oid, then UpdateBlob() assumes that you are
storing
in bytea fields.
<p>If you do not have any blob fields, you can improve you can improve
general SQL query performance by disabling blob handling with
$connection->disableBlobs = true.
-</font></p><p><font><b>UpdateClob<a
name="updateclob"></a>($table,$column,$val,$where)</b></font></p>
+</p></font><p><font><b>UpdateClob<a
name="updateclob"></a>($table,$column,$val,$where)</b></font></p>
<font>Allows you to store a clob (in $val) into $table into $column in a row
at $where.
Similar to UpdateBlob (see above), but for Character Large OBjects.
</font><p><font> Usage:
@@ -1949,6 +1952,7 @@
query the database to get the field names, but given that you are not directly
coding the SQL yourself, you probably aren't interested in
speed at all, but convenience.
<p>Since 4.62, the table name to be used can be overridden by setting
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
+<p>Since 4.94, setting the global variable $ADODB_QUOTE_FIELDNAMES to true
will force field names to be auto-quoted in AutoExecute(), GetInsertSQL() and
GetUpdateSQL(). </p>
<p><font><b>GetUpdateSQL<a name="getupdatesql"></a>(&$rs, $arrFields,
$forceUpdate=false,$magicq=false, $force=null)</b></font></p>
<p><font>Generate SQL to update a table given a recordset $rs, and the
modified fields
of the array $arrFields (which must be an associative array holding the
column
@@ -1960,7 +1964,7 @@
<font> </font><p><font>Since 4.52, we allow you to pass the $force type
parameter, and this overrides the <a
href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
global variable.
<p>Since 4.62, the table name to be used can be overridden by setting
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
-</font></p><p><font><b>GetInsertSQL<a name="getinsertsql"></a>(&$rs,
$arrFields,$magicq=false,$force_type=false)</b></font></p>
+</p></font><p><font><b>GetInsertSQL<a name="getinsertsql"></a>(&$rs,
$arrFields,$magicq=false,$force_type=false)</b></font></p>
<p><font>Generate SQL to insert into a table given a recordset $rs. Requires
the query
to be associative. $magicq is used to indicate whether magic quotes are
enabled
(for qstr()). The field names in the array are
case-insensitive.</font></p>
@@ -1970,7 +1974,7 @@
</font></p><p><font>Since 4.52, we allow you to pass the $force_type
parameter, and this overrides the <a
href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
global variable.
<p>Since 4.62, the table name to be used can be overridden by setting
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
-</font></p><p><font><b>PageExecute<a name="pageexecute"></a>($sql, $nrows,
$page, $inputarr=false)</b>
+</p></font><p><font><b>PageExecute<a name="pageexecute"></a>($sql, $nrows,
$page, $inputarr=false)</b>
</font></p><p><font>Used for pagination of recordset. $page is 1-based. See <a
href="#ex8">Example
8</a>.</font></p>
@@ -2613,7 +2617,7 @@
<font>
</font><p><font>This function is available in both ADORecordSet
and ADOConnection since 1.91. </font></p>
-<p><font><b>OffsetDate<a name="offsetdate"></a>($dayFraction,
+<p><font><b>OffsetDate<a name="OffsetDate"></a>($dayFraction,
$basedate=false)</b></font></p>
<p><font>Returns a string with the native SQL functions to calculate
future and past dates based on $basedate in a portable fashion. If
$basedate
@@ -2920,6 +2924,52 @@
PHP</a>. </font></p>
<h2><font>Change Log<a name="Changes"></a><a name="changes"></a><a
name="changelog"></a></font></h2>
+
+<p><a name="4.94"></a><b>4.94 23 Jan 2007</b>
+<p>Active Record: $ADODB_ASSOC_CASE=2 did not work properly. Fixed. Thx
gmane#auxbuss.com.
+<p>mysqli had bugs in BeginTrans() and EndTrans(). Fixed.</p>
+<p>Improved error handling when no database is connected for oci8. Thx Andy
Hassall.</p>
+<p>Names longer than 30 chars in oci8 datadict will be changed to random name.
Thx Eugenio. http://phplens.com/lens/lensforum/msgs.php?id=16182
+<p>Added var $upperCase = 'ucase' to access and ado_access drivers. Thx Renato
De Giovanni renato#cria.org.br</p>
+<p>Postgres64 driver, if preparing plan failed in _query, did not handle error
properly. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=16131.
+<p>Fixed GetActiveRecordsClass() reference bug. See
http://phplens.com/lens/lensforum/msgs.php?id=16120
+<p>
+
+Added handling of nulls in adodb-ado_mssql.inc.php for qstr(). Thx to Felix
Rabinovich.
+<p>
+
+Adodb-dict contributions by Gaetano:
+<br>
++ Support for INDEX in data-dict. Example:
+idx_ev1. The ability to define indexes using the INDEX keyword was added in
ADOdb 4.94. The following example features mutiple indexes, including a
compound index idx_ev1.
+<pre>
+ event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
+ event_type I(4) NOTNULL <b>INDEX idx_evt</b>,
+ event_start_date T DEFAULT NULL <b>INDEX id_esd</b>,
+ event_end_date T DEFAULT '0000-00-00 00:00:00' <b>INDEX id_eted</b>,
+ event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 <b>INDEX id_evp</b>,
+ event_owner I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
+ event_project I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
+ event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
+ event_icon C(20) DEFAULT 'obj/event',
+ event_description X
+</pre>
+<br>
++ Prevents the generated SQL from including double drop-sequence statements
for REPLACE case of tables with autoincrement columns (on those dbs that
emulate it via sequences)
+<br>
++ makes any date defined as DEFAULT value for D and T columns work
cross-database, not just the "sysdate" value (as long as it is specified using
adodb standard format). See above example.
+<p>Fixed pdo's GetInsertID() support. Thx Ricky Su.
+<p>oci8 Prepare() now sets error messages if an error occurs.
+<p>Added 'PT_BR' to SetDateLocale() -- brazilian portugese.
+<p>charset in oci8 was not set correctly on *Connect()
+<p>ADOConnection::Transpose() now appends as first column the field names.
+<p>Added $ADODB_QUOTE_FIELDNAMES. If set to true, will autoquote field names
in AutoExecute(),GetInsertSQL(), GetUpdateSQL().
+<p>Transpose now adds the field names as the first column after transposition.
+<p>Added === check in ADODB_SetDatabaseAdapter for $db,
adodb-active-record.inc.php. Thx Christian Affolter.
+<p>Added ErrorNo() to adodb-active-record.inc.php. Thx ante#novisplet.com.
+
+
+
<p><a name="4.93"></a><b>4.93 10 Oct 2006</b>
<p>Added support for multiple database connections in performance monitoring
code (adodb-perf.inc.php). Now all sql in multiple database connections can be
saved into one database ($ADODB_LOG_CONN).
<p>Added MetaIndexes() to odbc_mssql.
@@ -2930,11 +2980,13 @@
<p>Patched postgres64 _connect to handle serverinfo(). see
http://phplens.com/lens/lensforum/msgs.php?id=15887.
<p>Added pdo fix for null columns. See
http://phplens.com/lens/lensforum/msgs.php?id=15889
<p>For stored procedures, missing connection id now passed into mssql_query().
Thx Ecsy (ecsy#freemail.hu).
+
<p><a name="4.92a"></a><b>4.92a 30 Aug 2006</b>
<p>Syntax error in postgres7 driver. Thx Eloy Lafuente Plaza.
<p>Minor bug fixes - adodb informix 10 types added to adodb.inc.php. Thx
Fernando Ortiz.
<p><a name="4.92"></a><b>4.92 29 Aug 2006</b>
+
<p>Better odbtp date support.
<P>Added IgnoreErrors() to bypass default error handling.
<p>The _adodb_getcount() function in adodb-lib.inc.php, some ORDER BY bug
fixes.
Index: docs/docs-datadict.htm
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/docs/docs-datadict.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- docs/docs-datadict.htm 10 Oct 2006 10:44:43 -0000 1.7
+++ docs/docs-datadict.htm 13 Mar 2007 13:53:23 -0000 1.8
@@ -20,7 +20,7 @@
</head>
<body style="background-color: rgb(255, 255, 255);">
<h2>ADOdb Data Dictionary Library for PHP</h2>
-<p>V4.93 10 Oct 2006 (c) 2000-2006 John Lim (<a
+<p>V4.94 23 Jan 2007 (c) 2000-2007 John Lim (<a
href="mailto:jlim#natsoft.com.my";>jlim#natsoft.com.my</a>).<br>
AXMLS (c) 2004 ars Cognita, Inc</p>
<p><font size="1">This software is dual licensed using BSD-Style and
@@ -48,6 +48,25 @@
color="#006600"># We have a portable declarative data dictionary format in
ADOdb, similar to SQL.<br> # Field types use 1 character codes, and fields are
separated by commas.<br> # The following example creates three fields: "col1",
"col2" and "col3":</font><br> $flds = " <br> <font
color="#663300"><strong> col1 C(32) NOTNULL DEFAULT 'abc',<br> col2 I
DEFAULT 0,<br> col3 N(12.2)</strong></font><br> ";<br><br> <font
color="#006600"># We demonstrate creating tables and indexes</font><br>
$sqlarray = $dict-><strong>CreateTableSQL</strong>($tabname, $flds,
$taboptarray);<br>
$dict-><strong>ExecuteSQLArray</strong>($sqlarray);<br><br> $idxflds =
'co11, col2';<br> $sqlarray =
$dict-><strong>CreateIndexSQL</strong>($idxname, $tabname, $idxflds);<br>
$dict-><strong>ExecuteSQLArray</strong>($sqlarray);<br></pre>
+<h3>More Complex Table Sample</h3>
+<p>
+The following string will create a table with a primary key event_id and
multiple indexes, including one compound index idx_ev1. The ability to define
indexes using the INDEX keyword was added in ADOdb 4.94 by Gaetano Giunta.
+<pre>
+$flds = "
+ event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
+ event_type I(4) NOTNULL <b>INDEX idx_evt</b>,
+ event_start_date T DEFAULT NULL <b>INDEX id_esd</b>,
+ event_end_date T DEFAULT '0000-00-00 00:00:00' <b>INDEX id_eted</b>,
+ event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 <b>INDEX id_evp</b>,
+ event_owner I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
+ event_project I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
+ event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
+ event_icon C(20) DEFAULT 'obj/event',
+ event_description X
+";
+$sqlarray = $db-><b>CreateTableSQL</b>($tablename, $flds);
+$dict-><b>ExecuteSQLArray</b>($sqlarray);
+</pre>
<h3>Class Factory</h3>
<h4>NewDataDictionary($connection, $drivername=false)</h4>
<p>Creates a new data dictionary object. You pass a database connection object
in $connection. The $connection does not have to be actually connected to the
database. Some database connection objects are generic (eg. odbtp and odbc).
Since 4.53, you can tell ADOdb the actual database with $drivername. E.g.</p>
Index: docs/docs-perf.htm
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/docs/docs-perf.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- docs/docs-perf.htm 10 Oct 2006 10:44:43 -0000 1.7
+++ docs/docs-perf.htm 13 Mar 2007 13:53:23 -0000 1.8
@@ -18,7 +18,7 @@
</head>
<body>
<h3>The ADOdb Performance Monitoring Library</h3>
-<p>V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my)</p>
+<p>V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my)</p>
<p><font size="1">This software is dual licensed using BSD-Style and
LGPL. This means you can use it in compiled proprietary and commercial
products.</font></p>
Index: docs/docs-session.htm
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/docs/docs-session.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- docs/docs-session.htm 10 Oct 2006 10:44:43 -0000 1.7
+++ docs/docs-session.htm 13 Mar 2007 13:53:23 -0000 1.8
@@ -21,7 +21,7 @@
<body style="background-color: rgb(255, 255, 255);">
<h1>ADODB Session 2 Management Manual</h1>
<p>
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my)
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my)
</p>
<p> <font size="1">This software is dual licensed using BSD-Style and
LGPL. This means you can use it in compiled proprietary and commercial
Index: docs/docs-session.old.htm
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/docs/docs-session.old.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- docs/docs-session.old.htm 10 Oct 2006 10:44:43 -0000 1.2
+++ docs/docs-session.old.htm 13 Mar 2007 13:53:23 -0000 1.3
@@ -21,7 +21,7 @@
<body style="background-color: rgb(255, 255, 255);">
<h3>ADODB Session Management Manual</h3>
<p>
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my)
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my)
</p>
<p> <font size="1">This software is dual licensed using BSD-Style and
LGPL. This means you can use it in compiled proprietary and commercial
Index: drivers/adodb-access.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-access.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-access.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-access.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@@ -27,6 +27,7 @@
var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
var $sysTimeStamp = 'NOW';
var $hasTransactions = false;
+ var $upperCase = 'ucase';
function ADODB_access()
{
Index: drivers/adodb-ado.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-ado.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-ado.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-ado5.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-ado5.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-ado5.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-ado_access.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-ado_access.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-ado_access.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@@ -27,6 +27,7 @@
var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
var $sysTimeStamp = 'NOW';
var $hasTransactions = false;
+ var $upperCase = 'ucase';
function ADODB_ado_access()
{
Index: drivers/adodb-ado_mssql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-ado_mssql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-ado_mssql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -65,6 +65,12 @@
$this->Execute("SET TRANSACTION ".$transaction_mode);
}
+ function qstr($s,$magic_quotes=false)
+ {
+ $s = ADOConnection::qstr($s, $magic_quotes);
+ return str_replace("\0", "\\\\000", $s);
+ }
+
function MetaColumns($table)
{
$table = strtoupper($table);
Index: drivers/adodb-borland_ibase.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-borland_ibase.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-borland_ibase.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-csv.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-csv.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-csv.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-db2.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-db2.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-db2.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL
extension
for PHP (http://pecl.php.net/package/ibm_db2), which in turn requires DB2
V8.2.2 or
Index: drivers/adodb-fbsql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-fbsql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-fbsql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All
rights reserved.
+ @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All
rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-firebird.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-firebird.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-firebird.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-ibase.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-ibase.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-ibase.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-informix.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-informix.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-informix.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
-* @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All
rights reserved.
+* @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All
rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: drivers/adodb-informix72.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-informix72.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-informix72.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim. All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 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.
Index: drivers/adodb-ldap.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-ldap.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-ldap.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-mssql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-mssql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-mssql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-mssqlpo.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-mssqlpo.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-mssqlpo.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
-* @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All
rights reserved.
+* @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All
rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: drivers/adodb-mysql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-mysql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-mysql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -628,13 +628,13 @@
if ($fieldOffset != -1) {
$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
$f = @mysql_field_flags($this->_queryID,$fieldOffset);
- $o->max_length =
@mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson
(address@hidden)
+ $o->max_length =
@mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson
(jnich#att.com)
//$o->max_length = -1; // mysql returns the max length
less spaces -- so it is unrealiable
$o->binary = (strpos($f,'binary')!== false);
}
else if ($fieldOffset == -1) { /* The $fieldOffset
argument is not provided thus its -1 */
$o = @mysql_fetch_field($this->_queryID);
- $o->max_length = @mysql_field_len($this->_queryID); //
suggested by: Jim Nicholson (address@hidden)
+ $o->max_length = @mysql_field_len($this->_queryID); //
suggested by: Jim Nicholson (jnich#att.com)
//$o->max_length = -1; // mysql returns the max length less
spaces -- so it is unrealiable
}
Index: drivers/adodb-mysqli.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-mysqli.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-mysqli.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -138,6 +138,18 @@
return " IFNULL($field, $ifNull) "; // if MySQL
}
+ // do not use $ADODB_COUNTRECS
+ function GetOne($sql,$inputarr=false)
+ {
+ $ret = false;
+ $rs = &$this->Execute($sql,$inputarr);
+ if ($rs) {
+ if (!$rs->EOF) $ret = reset($rs->fields);
+ $rs->Close();
+ }
+ return $ret;
+ }
+
function ServerInfo()
{
$arr['description'] = $this->GetOne("select version()");
@@ -150,7 +162,9 @@
{
if ($this->transOff) return true;
$this->transCnt += 1;
- $this->Execute('SET AUTOCOMMIT=0');
+
+ //$this->Execute('SET AUTOCOMMIT=0');
+ mysqli_autocommit($this->_connectionID, false);
$this->Execute('BEGIN');
return true;
}
@@ -162,7 +176,9 @@
if ($this->transCnt) $this->transCnt -= 1;
$this->Execute('COMMIT');
- $this->Execute('SET AUTOCOMMIT=1');
+
+ //$this->Execute('SET AUTOCOMMIT=1');
+ mysqli_autocommit($this->_connectionID, true);
return true;
}
@@ -171,7 +187,8 @@
if ($this->transOff) return true;
if ($this->transCnt) $this->transCnt -= 1;
$this->Execute('ROLLBACK');
- $this->Execute('SET AUTOCOMMIT=1');
+ //$this->Execute('SET AUTOCOMMIT=1');
+ mysqli_autocommit($this->_connectionID, true);
return true;
}
Index: drivers/adodb-mysqlt.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-mysqlt.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-mysqlt.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-netezza.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-netezza.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-netezza.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
Based on the previous postgres drivers.
Index: drivers/adodb-oci8.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-oci8.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-oci8.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
- version V4.93 10 Oct 2006 (c) 2000-2006 John Lim. All rights reserved.
+ version V4.94 23 Jan 2007 (c) 2000-2007 John Lim. All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -211,22 +211,22 @@
//if ($argHostname) print "<p>Connect: 1st argument should be
left blank for $this->databaseType</p>";
if ($mode==1) {
$this->_connectionID = ($this->charSet) ?
- OCIPLogon($argUsername,$argPassword,
$argDatabasename)
+ OCIPLogon($argUsername,$argPassword,
$argDatabasename,$this->charSet)
:
- OCIPLogon($argUsername,$argPassword,
$argDatabasename, $this->charSet)
+ OCIPLogon($argUsername,$argPassword,
$argDatabasename)
;
if ($this->_connectionID && $this->autoRollback)
OCIrollback($this->_connectionID);
} else if ($mode==2) {
$this->_connectionID = ($this->charSet) ?
- OCINLogon($argUsername,$argPassword,
$argDatabasename)
+ OCINLogon($argUsername,$argPassword,
$argDatabasename,$this->charSet)
:
- OCINLogon($argUsername,$argPassword,
$argDatabasename, $this->charSet);
+ OCINLogon($argUsername,$argPassword,
$argDatabasename);
} else {
$this->_connectionID = ($this->charSet) ?
- OCILogon($argUsername,$argPassword,
$argDatabasename)
+ OCILogon($argUsername,$argPassword,
$argDatabasename,$this->charSet)
:
- OCILogon($argUsername,$argPassword,
$argDatabasename,$this->charSet);
+ OCILogon($argUsername,$argPassword,
$argDatabasename);
}
if (!$this->_connectionID) return false;
if ($this->_initdate) {
@@ -434,10 +434,10 @@
{
if ($this->_errorMsg !== false) return $this->_errorMsg;
- if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
+ if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
if (empty($arr)) {
- $arr = @OCIerror($this->_connectionID);
- if ($arr === false) $arr = @OCIError();
+ if (is_resource($this->_connectionID)) $arr =
@OCIError($this->_connectionID);
+ else $arr = @OCIError();
if ($arr === false) return '';
}
$this->_errorMsg = $arr['message'];
@@ -783,7 +783,16 @@
$stmt = OCIParse($this->_connectionID,$sql);
- if (!$stmt) return false;
+ if (!$stmt) {
+ $this->_errorMsg = false;
+ $this->_errorCode = false;
+ $arr = @OCIError($this->_connectionID);
+ if ($arr === false) return false;
+
+ $this->_errorMsg = $arr['message'];
+ $this->_errorCode = $arr['code'];
+ return false;
+ }
$BINDNUM += 1;
@@ -1374,10 +1383,11 @@
$arr =& $this->GetArray($nrows);
return $arr;
}
+ $arr = array();
for ($i=1; $i < $offset; $i++)
- if (address@hidden($this->_queryID)) return array();
+ if (address@hidden($this->_queryID)) return $arr;
- if
(address@hidden($this->_queryID,$this->fields,$this->fetchMode)) return array();
+ if
(address@hidden($this->_queryID,$this->fields,$this->fetchMode)) return $arr;;
$results = array();
$cnt = 0;
while (!$this->EOF && $nrows != $cnt) {
Index: drivers/adodb-oci805.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-oci805.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-oci805.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/**
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: drivers/adodb-oci8po.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-oci8po.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-oci8po.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim. All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 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.
Index: drivers/adodb-odbc.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-odbc.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-odbc.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-odbc_db2.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-odbc_db2.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-odbc_db2.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-odbc_mssql.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-odbc_mssql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-odbc_mssql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-odbc_oracle.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-odbc_oracle.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-odbc_oracle.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-odbtp.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-odbtp.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-odbtp.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@@ -149,13 +149,14 @@
//if uid & pwd can be separate
function _connect($HostOrInterface, $UserOrDSN='', $argPassword='',
$argDatabase='')
{
- $this->_connectionID =
@odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
- odbtp_convert_datetime($this->_connectionID,true);
-
+ $this->_connectionID =
odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
if ($this->_connectionID === false) {
$this->_errorMsg = $this->ErrorMsg() ;
return false;
}
+
+ odbtp_convert_datetime($this->_connectionID,true);
+
if ($this->_dontPoolDBC) {
if (function_exists('odbtp_dont_pool_dbc'))
@odbtp_dont_pool_dbc($this->_connectionID);
@@ -217,6 +218,7 @@
$this->replaceQuote = "'+chr(39)+'";
$this->true = '.T.';
$this->false = '.F.';
+
break;
case 'oracle':
$this->databaseType = 'odbtp_oci8';
@@ -288,7 +290,7 @@
for ($i=0; $i < sizeof($arr); $i++) {
if ($arr[$i][3] == 'SYSTEM TABLE' ) continue;
if ($arr[$i][2])
- $arr2[] = $showSchema ?
$arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
+ $arr2[] = $showSchema && $arr[$i][1]?
$arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
}
return $arr2;
}
@@ -324,6 +326,7 @@
$fld->max_length = $rs->fields[6];
$fld->not_null = !empty($rs->fields[9]);
$fld->scale = $rs->fields[7];
+ if (isset($rs->fields[12])) // vfp does not
have field 12
if (!is_null($rs->fields[12])) {
$fld->has_default = true;
$fld->default_value = $rs->fields[12];
@@ -547,7 +550,7 @@
return false;
}
} else {
- $stmtid = @odbtp_query($sql,$this->_connectionID);
+ $stmtid = odbtp_query($sql,$this->_connectionID);
}
$this->_lastAffectedRows = 0;
if ($stmtid) {
@@ -642,6 +645,12 @@
default:
$this->fields =
@odbtp_fetch_array($this->_queryID, $type);
}
+ if ($this->databaseType = 'odbtp_vfp') {
+ if ($this->fields)
+ foreach($this->fields as $k => $v) {
+ if (strncmp($v,'1899-12-30',10) == 0)
$this->fields[$k] = '';
+ }
+ }
return is_array($this->fields);
}
Index: drivers/adodb-odbtp_unicode.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-odbtp_unicode.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-odbtp_unicode.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All
rights reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All
rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: drivers/adodb-oracle.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-oracle.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-oracle.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-pdo.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-pdo.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-pdo.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -134,6 +134,11 @@
$this->concat_operator = $d->concat_operator;
$this->nameQuote = $d->nameQuote;
+ $this->hasGenID = $d->hasGenID;
+ $this->_genIDSQL = $d->_genIDSQL;
+ $this->_genSeqSQL = $d->_genSeqSQL;
+ $this->_dropSeqSQL = $d->_dropSeqSQL;
+
$d->_init($this);
}
Index: drivers/adodb-pdo_mssql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-pdo_mssql.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-pdo_mssql.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-pdo_mysql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-pdo_mysql.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-pdo_mysql.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-pdo_oci.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-pdo_oci.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-pdo_oci.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-pdo_pgsql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-pdo_pgsql.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-pdo_pgsql.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-postgres.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-postgres.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-postgres.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-postgres64.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-postgres64.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-postgres64.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -770,10 +770,10 @@
}
$s = "PREPARE $plan ($params) AS
".substr($sql,0,strlen($sql)-2);
//adodb_pr($s);
- pg_exec($this->_connectionID,$s);
+ $rez = pg_exec($this->_connectionID,$s);
//echo $this->ErrorMsg();
}
-
+ if ($rez)
$rez = pg_exec($this->_connectionID,$exsql);
} else {
//adodb_backtrace();
Index: drivers/adodb-postgres7.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-postgres7.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-postgres7.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-postgres8.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-postgres8.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-postgres8.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-proxy.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-proxy.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-proxy.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-sapdb.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-sapdb.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-sapdb.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-sqlanywhere.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-sqlanywhere.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-sqlanywhere.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All
rights
+version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All
rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: drivers/adodb-sqlite.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-sqlite.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-sqlite.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-sqlitepo.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-sqlitepo.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-sqlitepo.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-sybase.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-sybase.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-sybase.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim. All rights reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 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.
Index: drivers/adodb-sybase_ase.inc.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- drivers/adodb-sybase_ase.inc.php 10 Oct 2006 10:44:43 -0000 1.5
+++ drivers/adodb-sybase_ase.inc.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-vfp.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- drivers/adodb-vfp.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ drivers/adodb-vfp.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: pear/Auth/Container/ADOdb.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pear/Auth/Container/ADOdb.php 4 Nov 2006 14:52:42 -0000 1.5
+++ pear/Auth/Container/ADOdb.php 13 Mar 2007 13:53:23 -0000 1.6
@@ -17,7 +17,7 @@
// | Richard Tango-Lowy <address@hidden> |
// +----------------------------------------------------------------------+
//
-// $Id: ADOdb.php,v 1.5 2006/11/04 14:52:42 sigurdne Exp $
+// $Id: ADOdb.php,v 1.6 2007/03/13 13:53:23 sigurdne Exp $
//
require_once 'Auth/Container.php';
@@ -35,7 +35,7 @@
*
* @author Richard Tango-Lowy <address@hidden>
* @package Auth
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
class Auth_Container_ADOdb extends Auth_Container
{
Index: perf/perf-db2.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/perf/perf-db2.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- perf/perf-db2.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ perf/perf-db2.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: perf/perf-informix.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/perf/perf-informix.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- perf/perf-informix.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ perf/perf-informix.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: perf/perf-mssql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/perf/perf-mssql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- perf/perf-mssql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ perf/perf-mssql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: perf/perf-mysql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/perf/perf-mysql.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- perf/perf-mysql.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ perf/perf-mysql.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: perf/perf-oci8.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/perf/perf-oci8.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- perf/perf-oci8.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ perf/perf-oci8.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: perf/perf-postgres.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/perf/perf-postgres.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- perf/perf-postgres.inc.php 10 Oct 2006 10:44:43 -0000 1.7
+++ perf/perf-postgres.inc.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
Index: session/adodb-compress-bzip2.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-compress-bzip2.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-compress-bzip2.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-compress-gzip.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-compress-gzip.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-compress-gzip.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-compress-gzip.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-cryptsession.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-cryptsession.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-cryptsession.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-cryptsession.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-cryptsession2.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-cryptsession2.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- session/adodb-cryptsession2.php 10 Oct 2006 10:44:43 -0000 1.2
+++ session/adodb-cryptsession2.php 13 Mar 2007 13:53:23 -0000 1.3
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-encrypt-mcrypt.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-encrypt-mcrypt.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-encrypt-mcrypt.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-encrypt-md5.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-encrypt-md5.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-encrypt-md5.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-encrypt-secret.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-encrypt-secret.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-encrypt-secret.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -1,7 +1,7 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-session-clob.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-session-clob.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-session-clob.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-session-clob.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-session-clob2.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-session-clob2.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- session/adodb-session-clob2.php 10 Oct 2006 10:44:43 -0000 1.2
+++ session/adodb-session-clob2.php 13 Mar 2007 13:53:23 -0000 1.3
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-session.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-session.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- session/adodb-session.php 10 Oct 2006 10:44:43 -0000 1.7
+++ session/adodb-session.php 13 Mar 2007 13:53:23 -0000 1.8
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
Index: session/adodb-session2.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-session2.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- session/adodb-session2.php 10 Oct 2006 10:44:43 -0000 1.2
+++ session/adodb-session2.php 13 Mar 2007 13:53:23 -0000 1.3
@@ -2,7 +2,7 @@
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Contributed by Ross Smith (address@hidden).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@@ -769,7 +769,7 @@
$qkey = $conn->qstr($key);
$rs2 =& $conn->UpdateBlob($table, 'sessdata', $val, "
sesskey=$qkey", strtoupper($clob));
- $rs = $conn->CompleteTrans();
+ $rs = @$conn->CompleteTrans();
}
Index: session/adodb-sessions.mysql.sql
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- session/adodb-sessions.mysql.sql 4 Nov 2006 14:52:42 -0000 1.8
+++ session/adodb-sessions.mysql.sql 13 Mar 2007 13:53:23 -0000 1.9
@@ -1,4 +1,4 @@
--- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql,v 1.8
2006/11/04 14:52:42 sigurdne Exp $
+-- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql,v 1.9
2007/03/13 13:53:23 sigurdne Exp $
CREATE DATABASE /*! IF NOT EXISTS */ adodb_sessions;
Index: session/adodb-sessions.oracle.clob.sql
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- session/adodb-sessions.oracle.clob.sql 4 Nov 2006 14:52:42 -0000
1.8
+++ session/adodb-sessions.oracle.clob.sql 13 Mar 2007 13:53:23 -0000
1.9
@@ -1,4 +1,4 @@
--- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql,v 1.8
2006/11/04 14:52:42 sigurdne Exp $
+-- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql,v 1.9
2007/03/13 13:53:23 sigurdne Exp $
DROP TABLE adodb_sessions;
Index: session/adodb-sessions.oracle.sql
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- session/adodb-sessions.oracle.sql 4 Nov 2006 14:52:42 -0000 1.8
+++ session/adodb-sessions.oracle.sql 13 Mar 2007 13:53:23 -0000 1.9
@@ -1,4 +1,4 @@
--- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql,v 1.8
2006/11/04 14:52:42 sigurdne Exp $
+-- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql,v 1.9
2007/03/13 13:53:23 sigurdne Exp $
DROP TABLE adodb_sessions;
Index: session/old/adodb-cryptsession.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- session/old/adodb-cryptsession.php 10 Oct 2006 10:44:43 -0000 1.5
+++ session/old/adodb-cryptsession.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: session/old/adodb-session-clob.php
===================================================================
RCS file:
/sources/phpgwapi/phpgwapi/inc/adodb/session/old/adodb-session-clob.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- session/old/adodb-session-clob.php 10 Oct 2006 10:44:43 -0000 1.5
+++ session/old/adodb-session-clob.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
- V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: session/old/adodb-session.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/session/old/adodb-session.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- session/old/adodb-session.php 10 Oct 2006 10:44:43 -0000 1.5
+++ session/old/adodb-session.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/benchmark.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/benchmark.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/benchmark.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/benchmark.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -8,7 +8,7 @@
<body>
<?php
/*
-V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.81 3 May 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/test-datadict.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/test-datadict.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/test-datadict.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/test-datadict.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,7 +1,7 @@
<?php
/*
- V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.81 3 May 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -47,11 +47,11 @@
$flds = "
ID I AUTO KEY,
-FIRSTNAME VARCHAR(30) DEFAULT 'Joan',
-LASTNAME VARCHAR(28) DEFAULT 'Chen' key,
+FIRSTNAME VARCHAR(30) DEFAULT 'Joan' INDEX idx_name,
+LASTNAME VARCHAR(28) DEFAULT 'Chen' key INDEX idx_name,
averylonglongfieldname X(1024) DEFAULT 'test',
price N(7.2) DEFAULT '0.00',
-MYDATE D DEFDATE,
+MYDATE D DEFDATE INDEX idx_date,
BIGFELLOW X NOTNULL,
TS T DEFTIMESTAMP";
@@ -62,7 +62,7 @@
$sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
$sqla = array_merge($sqla,$sqli);
- $sqli =
$dict->CreateIndexSQL('idx','testtable','firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
+ $sqli =
$dict->CreateIndexSQL('idx','testtable','price,firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
$sqla = array_merge($sqla,$sqli);
$sqli =
$dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
$sqla = array_merge($sqla,$sqli);
Index: tests/test-php5.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/test-php5.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/test-php5.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/test-php5.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
- V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.81 3 May 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/test.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/test.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/test.php 10 Oct 2006 10:44:43 -0000 1.6
+++ tests/test.php 13 Mar 2007 13:53:24 -0000 1.7
@@ -1,6 +1,6 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -9,7 +9,9 @@
Latest version is available at http://adodb.sourceforge.net
*/
-error_reporting(E_ALL);
+
+if (!defined('E_STRICT')) define('E_STRICT',0);
+error_reporting(E_ALL|E_STRICT);
$ADODB_FLUSH = true;
@@ -85,7 +87,7 @@
$create =false;
/*$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
- $rs = $db->Execute('select lastname,firstname,lastname,id from adoxyz');
+ $rs = $db->Execute('select lastname,firstname,lastname,id from ADOXYZ');
$arr = $rs->GetAssoc();
echo "<pre>";print_r($arr);
die();*/
@@ -124,13 +126,16 @@
if (defined('ADODB_EXTENSION')) $ext = ' Extension
'.ADODB_EXTENSION.' installed';
else $ext = '';
print "<h3>ADODB Version: $ADODB_vers Host: <i>$db->host</i>
Database: <i>$db->database</i> PHP: $phpv $ext</h3>";
+
flush();
+ if (function_exists('date_default_timezone_set'))
date_default_timezone_set('Asia/Kuala_Lumpur');
$arr = $db->ServerInfo();
print_r($arr);
- echo "<br>";
- $e = error_reporting(E_ALL-E_WARNING);
+ echo E_ALL,' ',E_STRICT, "<br>";
+ $e = error_reporting(E_ALL | E_STRICT);
+ echo error_reporting(),'<p>';
flush();
#$db->debug=1;
$tt = $db->Time();
@@ -164,11 +169,11 @@
print "<i>Error='$err'</i></p>";
if ($rez) print "<b>Cannot check if connection failed.</b> The
Connect() function returned true.</p>";
}
- error_reporting($e);
+ #error_reporting($e);
flush();
//$ADODB_COUNTRECS=false;
- $rs=$db->Execute('select * from adoxyz order by id');
+ $rs=$db->Execute('select * from ADOXYZ order by id');
if($rs === false) $create = true;
else $rs->Close();
@@ -180,24 +185,24 @@
return;
} else {
$db->debug = 99;
- $e = error_reporting(E_ALL-E_WARNING);
+ # $e = error_reporting(E_ALL-E_WARNING);
$db->Execute($createtab);
- error_reporting($e);
+ # error_reporting($e);
}
}
- error_reporting(E_ALL);
+ #error_reporting(E_ALL);
echo "<p>Testing Metatypes</p>";
$t = $db->MetaType('varchar');
if ($t != 'C') Err("Bad Metatype for varchar");
- $rs = &$db->Execute("delete from ADOXYZ"); // some ODBC drivers will
fail the drop so we delete
+ $rs = $db->Execute("delete from ADOXYZ"); // some ODBC drivers will
fail the drop so we delete
if ($rs) {
if(! $rs->EOF) print "<b>Error: </b>RecordSet returned by
Execute('delete...') should show EOF</p>";
$rs->Close();
} else print "err=".$db->ErrorMsg();
print "<p>Test select on empty table, FetchField when EOF, and
GetInsertSQL</p>";
- $rs = &$db->Execute("select id,firstname from ADOXYZ where id=9999");
+ $rs = $db->Execute("select id,firstname from ADOXYZ where id=9999");
if ($rs && !$rs->EOF) print "<b>Error: </b>RecordSet returned by
Execute(select...') on empty table should show EOF</p>";
if ($rs->EOF && (($ox = $rs->FetchField(0)) && !empty($ox->name))) {
$record['id'] = 99;
@@ -221,10 +226,10 @@
$rs = $db->Execute("insert into ADOXYZ
(id,firstname,lastname,created) values (99,'Should Not','Exist
(Commit)',$time)");
if ($rs && $db->CommitTrans()) {
$rs->Close();
- $rs = &$db->Execute("select * from ADOXYZ where id=99");
+ $rs = $db->Execute("select * from ADOXYZ where id=99");
if ($rs === false || $rs->EOF) {
print '<b>Data not saved</b></p>';
- $rs = &$db->Execute("select * from ADOXYZ where
id=99");
+ $rs = $db->Execute("select * from ADOXYZ where
id=99");
print_r($rs);
die();
} else print 'OK</p>';
@@ -249,7 +254,7 @@
} else
print "<b>Commit failed</b></p>";
- $rs = &$db->Execute('delete from ADOXYZ where id>50');
+ $rs = $db->Execute('delete from ADOXYZ where id>50');
if ($rs) $rs->Close();
if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt
(should be 0)");
@@ -320,7 +325,7 @@
$a = $db->MetaPrimaryKeys('ADOXYZ');
var_dump($a);
}
- $rs = &$db->Execute('delete from ADOXYZ');
+ $rs = $db->Execute('delete from ADOXYZ');
if ($rs) $rs->Close();
$db->debug = false;
@@ -344,7 +349,7 @@
ef")."</p>";//'
print "<p>Testing Foreign Keys</p>";
- $arr = $db->MetaForeignKeys('adoxyz',false,true);
+ $arr = $db->MetaForeignKeys('ADOXYZ',false,true);
print_r($arr);
if (!$arr) Err("No MetaForeignKeys");
break;
@@ -769,7 +774,7 @@
print_r($rs->fields);
}
if ($db->databaseType !== 'odbc') {
- $rs = &$db->Execute("select
id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
+ $rs = $db->Execute("select
id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
if ($rs) {
if ($rs->RecordCount() != 50) {
print "<p><b>RecordCount returns
".$rs->RecordCount().", should be 50</b></p>";
@@ -794,7 +799,7 @@
echo "<b>GetRow Test</b>";
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$val1 = $db->GetRow("select count(*) from ADOXYZ");
- $val2 =& $db->GetRow("select count(*) from ADOXYZ");
+ $val2 = $db->GetRow("select count(*) from ADOXYZ");
if ($val1[0] == 50 and sizeof($val1) == 1 and $val2[0] == 50 and
sizeof($val2) == 1) print "<p>GetRow returns ok</p>";
else {
print_r($val);
@@ -857,7 +862,7 @@
}
print "<p>FETCH_MODE = ASSOC: Should get 1, Caroline</p>";
- $rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by
id',2);
+ $rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',2);
if ($rs && !$rs->EOF) {
if (ADODB_ASSOC_CASE == 2) {
$id = 'ID';
@@ -880,7 +885,7 @@
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
print "<p>FETCH_MODE = NUM: Should get 1, Caroline</p>";
- $rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by
id',1);
+ $rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
if ($rs && !$rs->EOF) {
if (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
if ($rs->fields[0] != 1) {Err("Error 1");
print_r($rs->fields);};
@@ -893,9 +898,9 @@
$db->debug = false;
print "<p>GetRowAssoc Upper: Should get 1, Caroline</p>";
- $rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by
id',1);
+ $rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
if ($rs && !$rs->EOF) {
- $arr = &$rs->GetRowAssoc();
+ $arr = $rs->GetRowAssoc();
if ($arr['ID'] != 1) {Err("Error 1");print_r($arr);};
if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2");
print_r($arr);};
$rs->MoveNext();
@@ -903,16 +908,16 @@
}
print "<p>GetRowAssoc Lower: Should get 1, Caroline</p>";
- $rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by
id',1);
+ $rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
if ($rs && !$rs->EOF) {
- $arr = &$rs->GetRowAssoc(false);
+ $arr = $rs->GetRowAssoc(false);
if ($arr['id'] != 1) {Err("Error 1"); print_r($arr);};
if (trim($arr['firstname']) != 'Caroline') {Err("Error 2");
print_r($arr);};
}
print "<p>GetCol Test</p>";
- $col = $db->GetCol('select distinct firstname from adoxyz order by 1');
+ $col = $db->GetCol('select distinct firstname from ADOXYZ order by 1');
if (!is_array($col)) Err("Col size is wrong");
if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col
elements wrong");
@@ -929,7 +934,7 @@
print "<p>SelectLimit Distinct Test 1: Should see Caroline, John and
Mary</p>";
- $rs = &$db->SelectLimit('select distinct * from ADOXYZ order by id',3);
+ $rs = $db->SelectLimit('select distinct * from ADOXYZ order by id',3);
if ($rs && !$rs->EOF) {
@@ -945,7 +950,7 @@
} else Err("Failed SelectLimit Test 1");
print "<p>SelectLimit Test 2: Should see Mary, George and Mr. Alan</p>";
- $rs = &$db->SelectLimit('select * from ADOXYZ order by id',3,2);
+ $rs = $db->SelectLimit('select * from ADOXYZ order by id',3,2);
if ($rs && !$rs->EOF) {
if (trim($rs->fields[1]) != 'Mary') Err("Error 1 - No Mary,
instead: ".$rs->fields[1]);
$rs->MoveNext();
@@ -961,7 +966,7 @@
print "<p>SelectLimit Test 3: Should see Wai Hun and Steven</p>";
$db->debug=1;
global $A; $A=1;
- $rs = &$db->SelectLimit('select * from ADOXYZ order by id',-1,48);
+ $rs = $db->SelectLimit('select * from ADOXYZ order by id',-1,48);
$A=0;
if ($rs && !$rs->EOF) {
if (empty($rs->connection)) print "<b>Connection object missing
from recordset</b></br>";
@@ -978,7 +983,7 @@
$db->debug = false;
- $rs = &$db->Execute("select * from ADOXYZ order by id");
+ $rs = $db->Execute("select * from ADOXYZ order by id");
print "<p>Testing Move()</p>";
if (!$rs)Err( "Failed Move SELECT");
else {
@@ -1037,10 +1042,10 @@
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
if ($db->dataProvider == 'postgres') {
$sql = "select ".$db->Concat('cast(firstname as
varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as
d from ADOXYZ";
- $rs = &$db->Execute($sql);
+ $rs = $db->Execute($sql);
} else {
$sql = "select distinct ".$db->Concat('firstname',$db->qstr('
'),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
- $rs = &$db->Execute($sql);
+ $rs = $db->Execute($sql);
}
if ($rs) {
if (empty($_GET['hide'])) rs2html($rs);
@@ -1051,9 +1056,9 @@
print "<hr />Testing GetArray() ";
//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- $rs = &$db->Execute("select * from ADOXYZ order by id");
+ $rs = $db->Execute("select * from ADOXYZ order by id");
if ($rs) {
- $arr = &$rs->GetArray(10);
+ $arr = $rs->GetArray(10);
if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' ||
trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."<b>
ERROR</b><br>";
else print " OK<BR>";
}
@@ -1063,7 +1068,7 @@
echo "Testing error handling, should see illegal column 'x' error=<i>$e
($e2) </i><br>";
if (!$e || !$e2) Err("Error handling did not work");
print "Testing FetchNextObject for 1 object ";
- $rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ
where firstname='Caroline'");
+ $rs = $db->Execute("select distinct lastname,firstname from ADOXYZ
where firstname='Caroline'");
$fcnt = 0;
if ($rs)
while ($o = $rs->FetchNextObject()) {
@@ -1086,7 +1091,7 @@
//$arr = $db->GetArray("select lastname,firstname from ADOXYZ");
//print_r($arr);
print "<hr />";
- $rs =& $db->Execute("select distinct lastname,firstname,created from
ADOXYZ");
+ $rs = $db->Execute("select distinct lastname,firstname,created from
ADOXYZ");
if ($rs) {
$arr = $rs->GetAssoc();
@@ -1095,7 +1100,7 @@
else print " OK 1";
}
- $arr = &$db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
+ $arr = $db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
if ($arr) {
//print_r($arr);
if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print
$arr['See']." <b>ERROR</b><br>";
@@ -1111,31 +1116,31 @@
for ($loop=0; $loop < 1; $loop++) {
print "Testing GetMenu() and CacheExecute<BR>";
$db->debug = true;
- $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) print 'With blanks, Steven selected:'.
$rs->GetMenu('menu','Steven').'<BR>';
else print " Fail<BR>";
- $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) print ' No blanks, Steven selected: '.
$rs->GetMenu('menu','Steven',false).'<BR>';
else print " Fail<BR>";
- $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) print ' 1st line set to **** , Steven selected: '.
$rs->GetMenu('menu','Steven','1st:****').'<BR>';
else print " Fail<BR>";
- $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) print ' Multiple, Alan selected: '.
$rs->GetMenu('menu','Alan',false,true).'<BR>';
else print " Fail<BR>";
print '</p><hr />';
- $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) {
print ' Multiple, Alan and George selected: '.
$rs->GetMenu('menu',array('Alan','George'),false,true);
if (empty($rs->connection)) print "<b>Connection object missing
from recordset</b></br>";
@@ -1149,22 +1154,22 @@
print "<hr />";
print "Testing GetMenu2() <BR>";
- $rs = &$db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(4,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) print 'With blanks, Steven selected:'.
$rs->GetMenu2('menu',('Oey')).'<BR>';
else print " Fail<BR>";
- $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(6,"select distinct firstname,lastname from
ADOXYZ");
if ($rs) print ' No blanks, Steven selected: '.
$rs->GetMenu2('menu',('Oey'),false).'<BR>';
else print " Fail<BR>";
}
- echo "<h3>CacheEXecute</h3>";
+ echo "<h3>CacheExecute</h3>";
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
- $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(6,"select distinct firstname,lastname from
ADOXYZ");
print_r($rs->fields); echo $rs->fetchMode;echo "<br>";
echo $rs->Fields('firstname');
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from
ADOXYZ");
+ $rs = $db->CacheExecute(6,"select distinct firstname,lastname from
ADOXYZ");
print_r($rs->fields);echo "<br>";
echo $rs->Fields('firstname');
$db->debug = false;
@@ -1174,26 +1179,26 @@
$sql = 'select * from ADOXYZ where 0=1';
echo "<p>**Testing '$sql' (phplens compat 1)</p>";
- $rs = &$db->Execute($sql);
+ $rs = $db->Execute($sql);
if (!$rs) err( "<b>No recordset returned for '$sql'</b>");
if (!$rs->FieldCount()) err( "<b>No fields returned for $sql</b>");
if (!$rs->FetchField(1)) err( "<b>FetchField failed for $sql</b>");
$sql = 'select * from ADOXYZ order by 1';
echo "<p>**Testing '$sql' (phplens compat 2)</p>";
- $rs = &$db->Execute($sql);
+ $rs = $db->Execute($sql);
if (!$rs) err( "<b>No recordset returned for
'$sql'<br>".$db->ErrorMsg()."</b>");
$sql = 'select * from ADOXYZ order by 1,1';
echo "<p>**Testing '$sql' (phplens compat 3)</p>";
- $rs = &$db->Execute($sql);
+ $rs = $db->Execute($sql);
if (!$rs) err( "<b>No recordset returned for
'$sql'<br>".$db->ErrorMsg()."</b>");
// Move
- $rs1 = &$db->Execute("select id from ADOXYZ where id <= 2 order by 1");
- $rs2 = &$db->Execute("select id from ADOXYZ where id = 3 or id = 4
order by 1");
+ $rs1 = $db->Execute("select id from ADOXYZ where id <= 2 order by 1");
+ $rs2 = $db->Execute("select id from ADOXYZ where id = 3 or id = 4 order
by 1");
if ($rs1) $rs1->MoveLast();
if ($rs2) $rs2->MoveLast();
@@ -1223,7 +1228,7 @@
echo "<p>";
if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
- $sql = "select firstnames from adoxyz";
+ $sql = "select firstnames from ADOXYZ";
print "<p>Testing execution of illegal statement:
<i>$sql</i></p>";
if ($db->Execute($sql) === false) {
print "<p>This returns the following ErrorMsg():
<i>".$db->ErrorMsg()."</i> and ErrorNo(): ".$db->ErrorNo().'</p>';
@@ -1234,7 +1239,7 @@
print "<p>ASSOC TEST 2<br>";
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- $rs = $db->query('select * from adoxyz order by id');
+ $rs = $db->query('select * from ADOXYZ order by id');
if ($ee = $db->ErrorMsg()) {
Err("Error message=$ee");
}
@@ -1255,7 +1260,7 @@
print "<b>ADODB_FETCH_BOTH not supported</b> for
dataProvider=".$db->dataProvider."<br>";
} else {
$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
- $rs = $db->query('select * from adoxyz order by id');
+ $rs = $db->query('select * from ADOXYZ order by id');
for($i=0;$i<$rs->FieldCount();$i++)
{
$fld=$rs->FetchField($i);
@@ -1266,7 +1271,7 @@
print "<p>NUM TEST 2<br>";
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
- $rs = $db->query('select * from adoxyz order by id');
+ $rs = $db->query('select * from ADOXYZ order by id');
for($i=0;$i<$rs->FieldCount();$i++)
{
$fld=$rs->FetchField($i);
@@ -1276,7 +1281,7 @@
print "<p>ASSOC Test of SelectLimit<br>";
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- $rs = $db->selectlimit('select * from adoxyz order by id',3,4);
+ $rs = $db->selectlimit('select * from ADOXYZ order by id',3,4);
$cnt = 0;
while ($rs && !$rs->EOF) {
$cnt += 1;
@@ -1293,7 +1298,7 @@
if ($db->sysDate) {
$saved = $db->debug;
$db->debug = 1;
- $rs = $db->Execute("select {$db->sysDate} from adoxyz where
id=1");
+ $rs = $db->Execute("select {$db->sysDate} from ADOXYZ where
id=1");
if (ADORecordSet::UnixDate(date('Y-m-d')) !=
$rs->UnixDate($rs->fields[0])) {
print "<p><b>Invalid date {$rs->fields[0]}</b></p>";
} else
@@ -1309,13 +1314,13 @@
print "<p>Test CSV</p>";
include_once('../toexport.inc.php');
//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- $rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\'
he,\'"\' q from adoxyz',10);
+ $rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\'
he,\'"\' q from ADOXYZ',10);
print "<pre>";
print rs2csv($rs);
print "</pre>";
- $rs = $db->SelectLimit('select id,firstname,lastname,created,\'The
"young man", he said\' from adoxyz',10);
+ $rs = $db->SelectLimit('select id,firstname,lastname,created,\'The
"young man", he said\' from ADOXYZ',10);
if (PHP_VERSION < 5) {
print "<pre>";
@@ -1366,7 +1371,7 @@
print "<p>Test Replace</p>";
- $ret = $db->Replace('adoxyz',
+ $ret = $db->Replace('ADOXYZ',
array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
array('id'),
$autoq = true);
@@ -1385,14 +1390,14 @@
}
$ADODB_COUNTRECS = $savec;
}
- $ret = $db->Replace('adoxyz',
+ $ret = $db->Replace('ADOXYZ',
array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
array('id','firstname'),
$autoq = true);
if ($ret != 2) print "<b>Replace failed: </b>";
print "test A return value=$ret (2 expected) <p>";
- $ret = $db->Replace('adoxyz',
+ $ret = $db->Replace('ADOXYZ',
array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
'id',
$autoq = true);
@@ -1403,7 +1408,7 @@
print "<h3>rs2rs Test</h3>";
- $rs = $db->Execute('select * from adoxyz where id>= 1 order by id');
+ $rs = $db->Execute('select * from ADOXYZ where id>= 1 order by id');
$rs = $db->_rs2rs($rs);
$rs->valueX = 'X';
$rs->MoveNext();
@@ -1417,7 +1422,7 @@
$db->debug=true;
$sql = PivotTableSQL(
$db, # adodb connection
- 'adoxyz', # tables
+ 'ADOXYZ', # tables
'firstname', # row fields
'lastname', # column fields
false, # join
@@ -1438,7 +1443,7 @@
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
include_once "PEAR.php";
- $rs = $db->query('select * from adoxyz where id>0 and id<10 order by
id');
+ $rs = $db->query('select * from ADOXYZ where id>0 and id<10 order by
id');
$i = 0;
if ($rs && !$rs->EOF) {
@@ -1456,12 +1461,12 @@
}
- if ($i != $db->GetOne('select count(*) from adoxyz where id>0 and
id<10')) {
+ if ($i != $db->GetOne('select count(*) from ADOXYZ where id>0 and
id<10')) {
print "<p><b>PEAR DB emulation error 1.1 EOF ($i)</b></p>";
$pear = false;
}
- $rs = $db->limitQuery('select * from adoxyz where id>0 order by
id',$i=3,$top=3);
+ $rs = $db->limitQuery('select * from ADOXYZ where id>0 order by
id',$i=3,$top=3);
$i2 = $i;
if ($rs && !$rs->EOF) {
@@ -1487,7 +1492,7 @@
flush();
- $rs = $db->SelectLimit("select ".$db->sysDate." from adoxyz",1);
+ $rs = $db->SelectLimit("select ".$db->sysDate." from ADOXYZ",1);
$date = $rs->fields[0];
if (!$date) Err("Bad sysDate");
else {
@@ -1497,9 +1502,9 @@
}
$db->debug=1;
if ($db->dataProvider == 'oci8')
- $rs = $db->SelectLimit("select
to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from adoxyz",1);
+ $rs = $db->SelectLimit("select
to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from ADOXYZ",1);
else
- $rs = $db->SelectLimit("select ".$db->sysTimeStamp." from
adoxyz",1);
+ $rs = $db->SelectLimit("select ".$db->sysTimeStamp." from
ADOXYZ",1);
$date = $rs->fields[0];
if (!$date) Err("Bad sysTimeStamp");
else {
@@ -1572,7 +1577,7 @@
if ($metae !== DB_ERROR_NOSUCHTABLE) print "<p><b>MetaError=".$metae."
wrong</b>, should be ".DB_ERROR_NOSUCHTABLE."</p>";
else print "<p>MetaError ok (".DB_ERROR_NOSUCHTABLE."):
".$db->MetaErrorMsg($metae)."</p>";
if ($TESTERRS != 1) print "<b>raiseErrorFn select nowhere
failed</b><br>";
- $rs = $db->Execute('select * from adoxyz');
+ $rs = $db->Execute('select * from ADOXYZ');
if ($debugerr) print " Move";
$rs->Move(100);
$rs->_queryID = false;
@@ -1585,17 +1590,17 @@
print "<p>SetFetchMode() tests</p>";
$db->SetFetchMode(ADODB_FETCH_ASSOC);
- $rs = $db->SelectLimit('select firstname from adoxyz',1);
+ $rs = $db->SelectLimit('select firstname from ADOXYZ',1);
if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
- $rs = $db->SelectLimit('select firstname from adoxyz',1);
+ $rs = $db->SelectLimit('select firstname from ADOXYZ',1);
//var_dump($rs->fields);
if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
$db->SetFetchMode(ADODB_FETCH_NUM);
- $rs = $db->SelectLimit('select firstname from adoxyz',1);
+ $rs = $db->SelectLimit('select firstname from ADOXYZ',1);
if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
flush();
@@ -1733,6 +1738,6 @@
if (isset($_GET['time'])) adodb_date_test();
?>
-<p><i>ADODB Database Library (c) 2000-2006 John Lim. All rights reserved.
Released under BSD and LGPL, PHP <?php echo PHP_VERSION ?>.</i></p>
+<p><i>ADODB Database Library (c) 2000-2007 John Lim. All rights reserved.
Released under BSD and LGPL, PHP <?php echo PHP_VERSION ?>.</i></p>
</body>
</html>
Index: tests/test3.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/test3.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/test3.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/test3.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
- V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+ V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/test4.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/test4.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/test4.php 10 Oct 2006 10:44:43 -0000 1.6
+++ tests/test4.php 13 Mar 2007 13:53:24 -0000 1.7
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.50 6 July 2004 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: tests/test5.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/test5.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/test5.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/test5.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testcache.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testcache.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/testcache.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/testcache.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -2,7 +2,7 @@
<body>
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testdatabases.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testdatabases.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/testdatabases.inc.php 10 Oct 2006 10:44:43 -0000 1.6
+++ tests/testdatabases.inc.php 13 Mar 2007 13:53:24 -0000 1.7
@@ -1,7 +1,7 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testmssql.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testmssql.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/testmssql.php 22 Jun 2006 09:06:37 -0000 1.4
+++ tests/testmssql.php 13 Mar 2007 13:53:24 -0000 1.5
@@ -1,7 +1,7 @@
<?php
/**
- * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my).
All rights reserved.
+ * @version V4.50 6 July 2004 (c) 2000-2007 John Lim (jlim#natsoft.com.my).
All rights reserved.
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
Index: tests/testoci8.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testoci8.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/testoci8.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/testoci8.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -2,7 +2,7 @@
<body>
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testoci8cursor.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testoci8cursor.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/testoci8cursor.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/testoci8cursor.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testpaging.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testpaging.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/testpaging.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/testpaging.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testpear.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testpear.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/testpear.php 22 Jun 2006 09:06:37 -0000 1.5
+++ tests/testpear.php 13 Mar 2007 13:53:24 -0000 1.6
@@ -1,6 +1,6 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: tests/testsessions.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/adodb/tests/testsessions.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/testsessions.php 29 Aug 2006 08:00:50 -0000 1.6
+++ tests/testsessions.php 13 Mar 2007 13:53:24 -0000 1.7
@@ -1,7 +1,7 @@
<?php
/*
-V4.80 8 Mar 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
reserved.
+V4.80 8 Mar 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights
reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Index: drivers/adodb-mssql_n.inc.php
===================================================================
RCS file: drivers/adodb-mssql_n.inc.php
diff -N drivers/adodb-mssql_n.inc.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ drivers/adodb-mssql_n.inc.php 13 Mar 2007 13:53:23 -0000 1.1
@@ -0,0 +1,166 @@
+<?php
+
+/// $Id $
+
+///////////////////////////////////////////////////////////////////////////
+// //
+// NOTICE OF COPYRIGHT //
+// //
+// ADOdb - Database Abstraction Library for PHP //
+// http://adodb.sourceforge.net/ //
+// //
+// Copyright (C) 2000-2007 John Lim (address@hidden) //
+// All rights reserved. //
+// Released under both BSD license and LGPL library license. //
+// Whenever there is any discrepancy between the two licenses, //
+// the BSD license will take precedence //
+// //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment //
+// http://moodle.com //
+// //
+// Copyright (C) 2001-3001 Martin Dougiamas http://dougiamas.com //
+// (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details: //
+// //
+// http://www.gnu.org/copyleft/gpl.html //
+// //
+///////////////////////////////////////////////////////////////////////////
+
+/**
+* MSSQL Driver with auto-prepended "N" for correct unicode storage
+* of SQL literal strings. Intended to be used with MSSQL drivers that
+* are sending UCS-2 data to MSSQL (FreeTDS and ODBTP) in order to get
+* true cross-db compatibility from the application point of view.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+// one useful constant
+if (!defined('SINGLEQUOTE')) define('SINGLEQUOTE', "'");
+
+include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
+
+class ADODB_mssql_n extends ADODB_mssql {
+ var $databaseType = "mssql_n";
+
+ function ADODB_mssqlpo()
+ {
+ ADODB_mssql::ADODB_mssql();
+ }
+
+ function _query($sql,$inputarr)
+ {
+ $sql = $this->_appendN($sql);
+ return ADODB_mssql::_query($sql,$inputarr);
+ }
+
+ /**
+ * This function will intercept all the literals used in the SQL,
prepending the "N" char to them
+ * in order to allow mssql to store properly data sent in the correct
UCS-2 encoding (by freeTDS
+ * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking
every project to add
+ * the "N" notation when working against MSSQL.
+ *
+ * Note that this hack only must be used if ALL the char-based columns in
your DB are of type nchar,
+ * nvarchar and ntext
+ */
+ function _appendN($sql) {
+
+ $result = $sql;
+
+ /// Check we have some single quote in the query. Exit ok.
+ if (strpos($sql, SINGLEQUOTE) === false) {
+ return $sql;
+ }
+
+ /// Check we haven't an odd number of single quotes (this can cause
problems below
+ /// and should be considered one wrong SQL). Exit with debug info.
+ if ((substr_count($sql, SINGLEQUOTE) & 1)) {
+ if ($this->debug) {
+ ADOConnection::outp("{$this->databaseType} internal
transformation: not converted. Wrong number of quotes (odd)");
+ }
+ return $sql;
+ }
+
+ /// Check we haven't any backslash + single quote combination. It should
mean wrong
+ /// backslashes use (bad magic_quotes_sybase?). Exit with debug info.
+ $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/';
+ if (preg_match($regexp, $sql)) {
+ if ($this->debug) {
+ ADOConnection::outp("{$this->databaseType} internal
transformation: not converted. Found bad use of backslash + single quote");
+ }
+ return $sql;
+ }
+
+ /// Remove pairs of single-quotes
+ $pairs = array();
+ $regexp = '/(' . SINGLEQUOTE . SINGLEQUOTE . ')/';
+ preg_match_all($regexp, $result, $list_of_pairs);
+ if ($list_of_pairs) {
+ foreach (array_unique($list_of_pairs[0]) as $key=>$value) {
+ $pairs['<@address@hidden@PAIR-'.$key.'@address@hidden@>'] =
$value;
+ }
+ if (!empty($pairs)) {
+ $result = str_replace($pairs, array_keys($pairs), $result);
+ }
+ }
+
+ /// Remove the rest of literals present in the query
+ $literals = array();
+ $regexp = '/(N?' . SINGLEQUOTE . '.*?' . SINGLEQUOTE . ')/is';
+ preg_match_all($regexp, $result, $list_of_literals);
+ if ($list_of_literals) {
+ foreach (array_unique($list_of_literals[0]) as $key=>$value) {
+
$literals['<address@hidden@#LITERAL-'.$key.'address@hidden@#>'] = $value;
+ }
+ if (!empty($literals)) {
+ $result = str_replace($literals, array_keys($literals),
$result);
+ }
+ }
+
+ /// Analyse literals to prepend the N char to them if their contents
aren't numeric
+ if (!empty($literals)) {
+ foreach ($literals as $key=>$value) {
+ if (!is_numeric(trim($value, SINGLEQUOTE))) {
+ /// Non numeric string, prepend our dear N
+ $literals[$key] = 'N' . trim($value, 'N'); //Trimming
potentially existing previous "N"
+ }
+ }
+ }
+
+ /// Re-apply literals to the text
+ if (!empty($literals)) {
+ $result = str_replace(array_keys($literals), $literals, $result);
+ }
+
+ /// Re-apply pairs of single-quotes to the text
+ if (!empty($pairs)) {
+ $result = str_replace(array_keys($pairs), $pairs, $result);
+ }
+
+ /// Print transformation if debug = on
+ if ($result != $sql && $this->debug) {
+ ADOConnection::outp("{$this->databaseType} internal
transformation:<br>{$sql}<br>to<br>{$result}");
+ }
+
+ return $result;
+ }
+}
+
+class ADORecordset_mssql_n extends ADORecordset_mssql {
+ var $databaseType = "mssql_n";
+ function ADORecordset_mssql_n($id,$mode=false)
+ {
+ $this->ADORecordset_mssql($id,$mode);
+ }
+}
+?>
\ No newline at end of file
- [Phpgroupware-cvs] phpgwapi/inc/adodb adodb-active-record.inc.php ...,
Sigurd Nes <=