summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-08-17Revert changes since Standardized file headers mergeDamien Regad192-4618/+3952
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
2021-08-17Fix syntax error in toexport.inc.php (#749)muzcb1-1/+1
2021-08-16Fix incorrect resolution of merge conflictsDamien Regad14-21/+201
Partial revert of e9dcce3df24912ad869d0193f0b419f2309101fc.
2021-08-16Reset version to 5.22.0-devDamien Regad1-1/+1
It was inadvertantly changed when merging the standardized headers (e9dcce3df24912ad869d0193f0b419f2309101fc).
2021-08-15Merge tag 'v5.21.1'Damien Regad13-228/+309
ADOdb version 5.21.1 released 2021-08-15 # Conflicts: # docs/changelog.md # drivers/adodb-odbc_mssql2012.inc.php # drivers/adodb-sqlite.inc.php # tests/testsessions.php
2021-08-15Merge branch 'hotfix/5.21' Standardized file headersDamien Regad189-3978/+4383
# 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
2021-08-15Merge branch 'hotfix/5.21' before new headersDamien Regad6-99/+85
Intermediate merging step to facilitate conflicts resolution caused by introduction of standard file headers. # Conflicts: # adodb-lib.inc.php # drivers/adodb-pdo_mysql.inc.php
2021-08-15Bump version to 5.21.1v5.21.1Damien Regad2-4/+3
2021-08-15Remove leftover legacy headersDamien Regad3-40/+5
A few of the old headers were not removed as part of PR #728.
2021-08-15Update ChangelogDamien Regad1-0/+43
2021-08-15PHPDoc, code styleDamien Regad3-16/+19
2021-08-15Cache Field objects with Property instead of static varDamien Regad2-21/+21
Change the static array introduced in fieldTypesArray() (see #367) to a class variable ($fieldObjectsCache), so the cache now only lasts for the Recordset's lifetime. Since the mssqlnative was already using a private $fieldObjects property for the same purpose, the declaration was removed, and usages of the old name changed to match the one defined in the parent class. Fixes #687
2021-08-15Remove invalid assignment by referenceDamien Regad1-1/+1
2021-08-15Coding guidelinesDamien Regad1-38/+29
2021-08-15mssql: duplicate key in SQLDate convert formatsDamien Regad1-1/+1
"y/m/d" key was defined both as 102 (ANSI) and 111 (Japan) (see #307). Updating the array to match documentation for ANSI, i.e. "y.m.d" [[1]]. Fixes #748 [1]: https://docs.microsoft.com/en-us/sql/t-sql/functions/cast-and-convert-transact-sql
2021-08-15Merge pull request #746Damien Regad4-99/+157
Fix incorrect handling of $ADODB_QUOTE_FIELDNAMES
2021-08-15Standard file header: LibTestDamien Regad1-0/+19
2021-08-15Composer: add PHPUnit 8.5 as dev requirementDamien Regad2-1/+5
The LibTest class was initially created for PHPUnit 7, which is no longer supported and incompatible with PHP 8. Adapting function signature to match parent class's definition (return type) means that ADOdb devs are now required to run PHP 7.2 or later to execute tests.
2021-08-15Use _adodb_quote_fieldname() in ADODB_Active_RecordDamien Regad1-59/+30
The code in nameQuoter() method was doing pretty much the same thing.
2021-08-15Test case for _adodb_quote_fieldname()Damien Regad1-0/+53
This is a basic test case to ensure the code matches expected results as discussed in #721 [[1]]. [1]: https://github.com/ADOdb/ADOdb/issues/721#issuecomment-817338903
2021-08-15WhitespaceDamien Regad1-8/+8
2021-08-15New _adodb_quote_fieldname() functionDamien Regad1-32/+43
Removes duplicated code in _adodb_getupdatesql(), _adodb_getinsertsql(). Fixes #721 (incorrect handling of $ADODB_QUOTE_FIELDNAMES = `true`, which was treated as 'BRACKETS' since 5.21.0, see #246).
2021-08-15Session XML schema: formatting, add field commentspeterdd1-17/+13
Fixes #732 Signed-off-by: Damien Regad <dregad@mantisbt.org>
2021-08-15Refactor ADODB_mssqlnative::_fetchField()Damien Regad1-50/+31
The method contained duplicated logic to return the fieldObject(s) data, once at the beginning of the function (if the data has already been cached), and one at the end after initializing the cache. Inverting the logic to start by initializing the data if it has not already been cached avoids this. Adjust PHPDoc return type.
2021-08-15Align adodb-pdo_mysql.inc.php with masterDamien Regad1-6/+14
Cherry-picked e3c6301bff536c3021dfc03ef4286a035820fd0e to prevent merge conflicts.
2021-08-14Remove debugging statementsMark Newnham1-3/+0
2021-08-14Code cleanupDamien Regad1-19/+9
Follow-up on 2d1af4c43827183a14302cf3af127a96fc2e6496 - Whitespace/coding guidelines - PHPDoc - Remove unnecessary if statement
2021-08-14Affected_rows returns number instead of falseMark Newnham1-3/+26
mysql_affected_rows() returns a valid value (i.e. works as a rowcount function) when used against a SELECT statement. This does not conform to the ADOdb standard, which requires it to return false. Fixes #604 (PR #729)
2021-08-14Standardized file headersDamien Regad189-2340/+3815
Merge PR https://github.com/ADOdb/ADOdb/pull/728
2021-08-14Standard file header: /sessionDamien Regad17-265/+358
2021-08-14Standard file header: /scriptsDamien Regad4-9/+68
2021-08-14Standard file header: /replicateDamien Regad3-51/+86
2021-08-14Standard file header: /perfDamien Regad7-101/+133
2021-08-14Standard file header: /pearDamien Regad2-27/+48
2021-08-14Standard file header: /driversDamien Regad62-1083/+1319
2021-08-14Standard file header: /testsDamien Regad30-178/+571
2021-08-14Standard file header: /langDamien Regad24-38/+491
2021-08-14Standard file header: /datadictDamien Regad14-154/+253
2021-08-14Standard file header: /Damien Regad24-392/+488
2021-08-14Remove unused filesDamien Regad2-42/+0
- adodb-iterator.inc.php: code has been moved to adodb.inc.php - adodb-php4.inc.php: ADODB_BASE_RS class stub not referenced anyhere
2021-08-13Build scripts require Python 3.7 or laterDamien Regad1-0/+3
2021-08-13Build scripts: use env in shebangDamien Regad3-3/+3
Allows use of virtual environments.
2021-08-05Remove newlines from index name in metaIndexesMark Newnham1-4/+7
The name of the index returned from the database includes trailing newlines that disrupt the display of data. This changes trims those newlinces
2021-07-10subselects in postgres requires aliasing see #736Mark Newnham1-1/+1
2021-07-10Subselects should be aliases in postgres see #736Mark Newnham1-1/+1
2021-07-07array to string conversion in _adodb_debug_execute see #737Mark Newnham1-1/+8
2021-07-07array to string conversion in adodb_debug_execute, see #737Mark Newnham1-1/+9
2021-06-15pdo: add spport for mietaindexes see #734Mark Newnham1-0/+61
2021-06-15Add support for metaIndexes see #733Mark Newnham1-0/+53
MetaIndexes not previously supported by PDO mysql driver. Fix recursion error introduced in affected_rows()
2021-06-13Fix recursion error in affected_rows()Mark Newnham1-3/+0
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:34:36 +0000