| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
- public visibility
- camelCase
- change $owner default from false to ''
- add $associative param where missing
- PHPDoc updates
|
|
|
|
ADOdb version 5.21.3 released 2021-10-31
# Conflicts:
# adodb.inc.php
# docs/changelog.md
|
|
|
|
|
|
Add try/finally blocks in selectLimit(), getOne(), getRow(), getArray()
and cacheGetArray() methods when temporarily changing $ADODB_COUNTRECS
global's value, to ensure it is correctly restored to its previous value
when the execute() call triggers an exception.
Fixes #761
|
|
|
|
# Conflicts:
# adodb.inc.php
# docs/changelog.md
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-mysqli.inc.php
Fixes #751
|
|
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
|
|
It was inadvertantly changed when merging the standardized headers
(e9dcce3df24912ad869d0193f0b419f2309101fc).
|
|
|
|
|
|
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
|
|
|
|
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
|
|
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
|
|
Update child classes so method signature matches the parent's.
|
|
|
|
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
|
|
|
|
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.
|
|
|
|
|
|
Fix whitespace
|
|
This was a mistake, as discussed in [[1]].
Fixes #694
[1]: https://github.com/ADOdb/ADOdb/issues/693#issuecomment-795251586
|
|
|
|
|
|
|
|
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
|
|
|
|
The $magic_quote parameter for public methods was kept for backwards
compatibility purposes, but is no longer used.
Fixes #674
|
|
# Conflicts:
# adodb.inc.php
|
|
Follow-up on #657, applies the same logic to remaining usages.
This code will be removed in ADOdb 5.21.0.
Fixes #619
|
|
# Conflicts:
# adodb-xmlschema03.inc.php
# adodb.inc.php
# drivers/adodb-pdo.inc.php
|
|
|
|
$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
|
|
Fixes #646
|
|
|
|
Change web site references from http://adodb.org to https.
|
|
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
|
|
|
|
Update of $ADODB_vers was missed in the previous bump commit.
|
|
|
|
The # symbol disupts the parse_url function so the password is temorarily substituted during the url decoding phase
|
|
The # symbol disupts the parse_url function so the password is temorarily substituted during the url decoding phase
|
|
|
|
|
|
|
