summaryrefslogtreecommitdiff
path: root/adodb.inc.php
AgeCommit message (Collapse)AuthorFilesLines
2021-08-14Standard file header: /Damien Regad1-27/+15
2021-04-23Remove subqueries without using regexDamien Regad1-0/+1
Following discussion in #718, using regex to identify and remove sub-queries in _adodb_getcount() is flawed and can't be fixed. This led to implementing a hack using _ADODB_COUNT "keyword" to (see #88 41839f5c18abe262ee088f1d4bd92453616d2a4a). This replaces the regex parsing by a simple loop on the query string, removing everything between the SELECT and the FROM clause, ignoring whatever is between parentheses (i.e. subqueries). The _ADODB_COUNT logic is therefore obsolete Fixes #715
2021-04-11mssql: enable _insertID() againDamien Regad1-0/+9
In ADOdb 5.21.0, for performance reasons [1] the _query() method no longer retrieves the last inserted Id. This introduced a regression, as it was only possible to retrieve the Insert Id for "normal" queries, but not parameterized ones as Insert_ID() always returned null in this case. To maintain the driver's performance, we now allow the client to decide whether insert queries should execute the extra SCOPE_IDENTITY() call, by providing a new enableLastInsertID() method. Fixes #692 [1]: https://github.com/ADOdb/ADOdb/issues/185#issuecomment-169057606
2021-04-11Add stub for ADOConnection::_insertID()Damien Regad1-1/+13
Update child classes so method signature matches the parent's.
2021-04-11PHPDoc for ADOConnection::$_connectionIDDamien Regad1-1/+2
2021-03-27mysqli: override setConnectionParameter()Damien Regad1-0/+3
Add error handling for $parameter type: since mysqli_options() requires an integer, the function now fails and returns false (or throws an exception if enabled) when given a non-numeric value. Fixes #693
2021-03-27Further improve PHPDoc for setConnectionParameter()Damien Regad1-6/+7
2021-03-27Move $connectionParameters declaration and improve PHPDocDamien Regad1-6/+13
The property was defined in the middle of methods, moved it up with other class properties where it belongs. Improved PHPDoc now includes data structure description and explanation.
2021-03-11WhitespaceDamien Regad1-14/+12
2021-03-11PHPDoc and camelCase for newDataDictionaryDamien Regad1-1/+9
2021-03-10Improve PHPdoc for setConnectionParameter()Damien Regad1-15/+17
Fix whitespace
2021-03-10setConnectionParameter() method should not be finalDamien Regad1-1/+1
This was a mistake, as discussed in [[1]]. Fixes #694 [1]: https://github.com/ADOdb/ADOdb/issues/693#issuecomment-795251586
2021-03-08Bump version to 5.21.1-devDamien Regad1-2/+2
2021-03-08get/setCharset: camelCase, PHPDoc, param consistencyDamien Regad1-2/+17
2021-02-27Bump version to 5.21.0v5.21.0Damien Regad1-2/+2
2021-02-26pgsql: Fix param(0) returning invalid $0 placeholderDamien Regad1-5/+9
Allowing param(false) to reset the query parameter count (see #380, commit 46fa66c10dc50547167d0f8bbbcb6484edf30d1c) introduced a regression when a falsy value was used, like `param(0)` in adodb-session2.php. ADODB_postgres64::param() now differenciates betwen use of: - falsy value -> reset count and return the first placeholder ($1) - boolean `false` -> reset count, do not return placeholder (next call will return $1). Updated PHPDoc for parent ADOConnection::param() to reflect this. Fixes #682, #380
2021-02-02Bump version to 5.21.0-rc.1v5.21.0-rc.1Damien Regad1-2/+2
2021-01-25Remove all magic quotes related codeDamien Regad1-88/+87
The $magic_quote parameter for public methods was kept for backwards compatibility purposes, but is no longer used. Fixes #674
2021-01-25Merge branch 'hotfix/5.20' into release/5.21Damien Regad1-2/+14
# Conflicts: # adodb.inc.php
2021-01-25Fix remaining usages of get_magic_* functionsDamien Regad1-2/+14
Follow-up on #657, applies the same logic to remaining usages. This code will be removed in ADOdb 5.21.0. Fixes #619
2021-01-24Merge branch 'hotfix/5.20' into release/5.21Damien Regad1-5/+11
# Conflicts: # adodb-xmlschema03.inc.php # adodb.inc.php # drivers/adodb-pdo.inc.php
2021-01-24Fix "Only variables can be returned by reference" warningDamien Regad1-1/+2
2021-01-24Added PHPDoc for some ADOConnection propertiesDamien Regad1-1/+13
$raiseErrorFn, $fnExecute and $fnCacheExecute are expected to contain callables, but as they are declared as false initially. This causes PHPStorm to incorrectly flag usage in the code as errors: Function name must be callable - a string, Closure or class implementing __invoke, currently bool
2020-12-20Replace adodb_str_replace() calls with str_replace()peterdd1-10/+6
Fixes #646
2020-12-20Bump version to 5.21.0-beta.1v5.21.0-beta.1Damien Regad1-2/+2
2020-12-19adodb.org is now served over SSLDamien Regad1-2/+2
Change web site references from http://adodb.org to https.
2020-12-16Merge branch 'hotfix/5.20' (v5.20.19)Damien Regad1-2/+6
Note on merge conflict in adodb.inc.php: At line 5133, parse_url() is called with `@` operator in the hotfix/5.20 branch (commit 2026e66e86f35995eee32557c2f83f1d539ca9c7) whereas the same change in the master branch (commit c1a6794ece2b02c2a5d238159ae85da3cbd6d) is without it. Code was kept as it is in master. # Conflicts: # adodb-lib.inc.php # adodb.inc.php # drivers/adodb-mssqlnative.inc.php # drivers/adodb-mysqli.inc.php # drivers/adodb-pdo.inc.php
2020-12-16Reset version to avoid merge conflictsDamien Regad1-2/+2
2020-12-16Bump version to 5.20.19 (again)v5.20.19Damien Regad1-1/+1
Update of $ADODB_vers was missed in the previous bump commit.
2020-12-14Bump version to 5.20.19Mark Newnham1-1/+1
2020-12-10DSN database connection with password containing # fails see #651Mark Newnham1-2/+34
The # symbol disupts the parse_url function so the password is temorarily substituted during the url decoding phase
2020-12-10DSN database connection with password containing # fails see #651Mark Newnham1-3/+39
The # symbol disupts the parse_url function so the password is temorarily substituted during the url decoding phase
2020-06-28Bump Versionv5.20.18Mark Newnham1-1/+1
2020-03-31Bump version to 5.20.17v5.20.17Damien Regad1-2/+2
2020-03-28Merge branch 'hotfix/5.20' of https://github.com/ADOdb/ADOdb into hotfix/5.20Mark Newnham1-2/+2
2020-01-30Merge remote-tracking branch 'origin/hotfix/5.20'Damien Regad1-2/+2
# Conflicts: # docs/changelog.md
2020-01-30Do not overwrite $fn function parameterDamien Regad1-2/+2
When using transactions (startTrans/completeTrans), the ADOdb Exception thrower function ($raiseErrorFn property) is replaced by a specific handler (ADODB_TransMonitor method), which itself calls the original handler (adodb_throw) by default. ADODB_TransMonitor incorrectly overwrites the $fn parameter (which drives the behavior of the ADODB_Exception class constructor) with the name of the original handler, causing ADOdb_Exception::__construct() to throw an "Array to string conversion" PHP notice when the query triggering the exception has parameters. Using a dedicated variable to store and call the original handler fixes the problem. Fixes #601
2020-01-24Remove early version checksMark Newnham1-8/+2
Always clone, but left in mysqli check for PHP7
2020-01-24Removed core ADODB_PHPVER constantMark Newnham1-12/+1
2020-01-20getAssoc failed using ADODB_FETCH_BOTHDamien Regad1-13/+16
If ADODB_FETCH_MODE is ADODB_FETCH_BOTH, and 2 columns were returned, the first column was returned as both the key and the value. Fixes #600
2020-01-12Reset version to avoid merge conflictsDamien Regad1-2/+2
2020-01-12Bump version to 5.20.16v5.20.16Damien Regad1-2/+2
2020-01-05Added and improved PHPDoc (adodb.inc.php)WiXSL1-148/+212
Fixes #445 Signed-off-by: Damien Regad <dregad@mantisbt.org> Rebased, conflicts resolved, fixed whitespace (indent with spaces).
2020-01-04remove unneeded function ADODB_str_replace see #582Mark Newnham1-20/+1
2020-01-04PHPDoc updateLaurent Navarro1-77/+144
This is @laurent-n's original submission from PR #489 with some whitespace adjustments, rebased to latest master. Signed-off-by: Damien Regad <dregad@mantisbt.org>
2019-12-30Support for T-SQL-styled square BracketsMarat1-0/+2
Microsoft wraps column names in square brackets in T-SQL statements, which is not really obligatory but becomes necessary when reserved keywords are used as columns names (e.g. 'BEGIN' or 'CURRENT'). Fixes #246 Signed-off-by: Damien Regad <dregad@mantisbt.org> Original commits from PR squashed and message reworded.
2019-11-24Bump version to 5.20.15v5.20.15Damien Regad1-2/+2
2019-11-24Merge branch 'hotfix/5.20'Damien Regad1-36/+92
# Conflicts: # adodb-lib.inc.php
2019-11-24New getMenuGrouped() method, deprecate getMenu3()Damien Regad1-12/+38
The new function is the same as getMenu3(), except that it has an extra parameter $compareFirstCol to align it with getMenu(). The new param defaults to true, i.e. defaults are compared against the value, not the description (opposite of getMenu3()). getMenu3() is marked as deprecated and just calls the new function.
2019-11-24PHPDoc update for getMenu3()Damien Regad1-6/+22
Coding guidelines / whitespace.