| Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
Try to do it right this time...
# Conflicts:
# adodb-memcache.lib.inc.php
Fixes #751
|
|
Fixes #751
|
|
The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.
Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:
- "Merge branch 'hotfix/5.21' Standardized file headers",
e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
20b01e83cb61b6b2460f64c7d1277c5f4cc28574.
Fixes #751
|
|
# Conflicts:
# adodb-active-record.inc.php
# adodb-active-recordx.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-loadbalancer.inc.php
# adodb-memcache.lib.inc.php
# adodb-pager.inc.php
# adodb-pear.inc.php
# adodb-perf.inc.php
# adodb-php4.inc.php
# adodb-time.inc.php
# adodb.inc.php
# datadict/datadict-access.inc.php
# datadict/datadict-db2.inc.php
# datadict/datadict-firebird.inc.php
# datadict/datadict-generic.inc.php
# datadict/datadict-ibase.inc.php
# datadict/datadict-informix.inc.php
# datadict/datadict-mssql.inc.php
# datadict/datadict-mssqlnative.inc.php
# datadict/datadict-mysql.inc.php
# datadict/datadict-oci8.inc.php
# datadict/datadict-postgres.inc.php
# datadict/datadict-sapdb.inc.php
# datadict/datadict-sqlite.inc.php
# datadict/datadict-sybase.inc.php
# drivers/adodb-access.inc.php
# drivers/adodb-ado.inc.php
# drivers/adodb-ado5.inc.php
# drivers/adodb-ado_access.inc.php
# drivers/adodb-ado_mssql.inc.php
# drivers/adodb-borland_ibase.inc.php
# drivers/adodb-csv.inc.php
# drivers/adodb-db2.inc.php
# drivers/adodb-db2oci.inc.php
# drivers/adodb-db2ora.inc.php
# drivers/adodb-fbsql.inc.php
# drivers/adodb-firebird.inc.php
# drivers/adodb-ibase.inc.php
# drivers/adodb-informix.inc.php
# drivers/adodb-informix72.inc.php
# drivers/adodb-ldap.inc.php
# drivers/adodb-mssql.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-mssqlpo.inc.php
# drivers/adodb-mysql.inc.php
# drivers/adodb-mysqli.inc.php
# drivers/adodb-mysqlpo.inc.php
# drivers/adodb-mysqlt.inc.php
# drivers/adodb-netezza.inc.php
# drivers/adodb-oci8.inc.php
# drivers/adodb-oci805.inc.php
# drivers/adodb-oci8po.inc.php
# drivers/adodb-oci8quercus.inc.php
# drivers/adodb-odbc.inc.php
# drivers/adodb-odbc_db2.inc.php
# drivers/adodb-odbc_mssql.inc.php
# drivers/adodb-odbc_oracle.inc.php
# drivers/adodb-odbtp.inc.php
# drivers/adodb-odbtp_unicode.inc.php
# drivers/adodb-oracle.inc.php
# drivers/adodb-pdo.inc.php
# drivers/adodb-pdo_dblib.inc.php
# drivers/adodb-pdo_firebird.inc.php
# drivers/adodb-pdo_mssql.inc.php
# drivers/adodb-pdo_mysql.inc.php
# drivers/adodb-pdo_oci.inc.php
# drivers/adodb-pdo_pgsql.inc.php
# drivers/adodb-pdo_sqlite.inc.php
# drivers/adodb-postgres.inc.php
# drivers/adodb-postgres64.inc.php
# drivers/adodb-postgres7.inc.php
# drivers/adodb-postgres8.inc.php
# drivers/adodb-postgres9.inc.php
# drivers/adodb-proxy.inc.php
# drivers/adodb-sapdb.inc.php
# drivers/adodb-sqlanywhere.inc.php
# drivers/adodb-sqlite3.inc.php
# drivers/adodb-sqlitepo.inc.php
# drivers/adodb-sybase.inc.php
# drivers/adodb-sybase_ase.inc.php
# drivers/adodb-text.inc.php
# drivers/adodb-vfp.inc.php
# pear/Auth/Container/ADOdb.php
# perf/perf-db2.inc.php
# perf/perf-informix.inc.php
# perf/perf-mssql.inc.php
# perf/perf-mssqlnative.inc.php
# perf/perf-mysql.inc.php
# perf/perf-oci8.inc.php
# perf/perf-postgres.inc.php
# pivottable.inc.php
# rsfilter.inc.php
# server.php
# session/adodb-compress-bzip2.php
# session/adodb-compress-gzip.php
# session/adodb-cryptsession.php
# session/adodb-cryptsession2.php
# session/adodb-encrypt-mcrypt.php
# session/adodb-encrypt-md5.php
# session/adodb-encrypt-secret.php
# session/adodb-session-clob.php
# session/adodb-session-clob2.php
# session/adodb-session.php
# session/adodb-session2.php
# session/old/adodb-cryptsession.php
# session/old/adodb-session-clob.php
# session/old/adodb-session.php
# tests/benchmark.php
# tests/client.php
# tests/test-datadict.php
# tests/test-php5.php
# tests/test.php
# tests/test3.php
# tests/test4.php
# tests/test5.php
# tests/testcache.php
# tests/testdatabases.inc.php
# tests/testmssql.php
# tests/testoci8.php
# tests/testoci8cursor.php
# tests/testpaging.php
# tests/testpear.php
# toexport.inc.php
# tohtml.inc.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Change web site references from http://adodb.org to https.
|
|
|
|
|
|
# Conflicts:
# adodb-time.inc.php
# docs/changelog.md
# drivers/adodb-mssql.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-oci8po.inc.php
|
|
|
|
|
|
|
|
The tables() function was incompatible
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This prevents PHP_CodeSniffer from automatically fixing the file to
comply with PSR-2 standards.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- running SED script
- manual adjustments for files not processed by regex
|
|
This is the original commit from @valioz, rebased on latest master
Signed-off-by: Damien Regad <dregad@mantisbt.org>
Conflicts:
drivers/adodb-db2ora.inc.php
drivers/adodb-mssqlpo.inc.php
drivers/adodb-odbc_oracle.inc.php
|
|
|
|
|
|
http://php.net/manual/en/language.basic-syntax.phptags.php
|
|
Bumped 'dev' version allows users who rely on source code downloaded
from the git repository rather than an official release tarball to
reliably determine that they are running a development version of the
library.
|
|
|
|
Was throwing error with E_STRICT. Fixes #1
|
|
Contact the commit's author directly for all comments/fixes.
General
=======
- The driver is qualified to run on Server 2005, 2008 and 2012.
- At startup, the driver identifies the SQL Server version, which
allows it to invisibly take advantage of new features available in SQL
server 2012.
- It will not run on SQL Server 2000, although I'm sure it would be
easy enough to fix.
- It includes all patches to the known bugs that I can find on the
phplens forum.
- Much of the debugging has been removed, as this impeded program
debugging when used with FastCGI
- Some fixes are my own versions of those reported on the phplens
boards
drivers/adodb-mssqlnative.inc
=============================
Changed mapping of bigint from I to I8
MetaColumns()
--------------
Missing MetaColumns function, re-introduced, Produces an extended list
of 10 field attributes, including auto-increment, nullable
GenID() / CreateSequence()
--------------------------
- On Server 2008 and lower, uses the historical sequence emulation.
- On Server 2012. Uses the newly introduced Create Sequence statement.
FetchField()
------------
This follows the method used in the oracle driver and caches the
metadata at initialisation, which helps performance.
datadict/datadict-mssqlnative.inc
=================================
Missing file reintroduced, to support SQL Server format datadict
functions
perf/perf-mssqlnative.inc
=========================
Tables()
--------
Arguments to the Tables() function declared incorrectly
|
|
- Move all files in adodb5/ to root
- Remove adodb-for-php4/ directory
|