| Age | Commit message (Collapse) | Author | Files | Lines |
|
# 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
|
|
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
|
|
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).
|
|
|
|
|
|
|
|
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
|
|
|
|
- Refactor the driver matching code to make it easier to add.
- Add support for PDO/mysql driver
|
|
|
|
|
|
|
|
The $magic_quote parameter for public methods was kept for backwards
compatibility purposes, but is no longer used.
Fixes #674
|
|
|
|
|
|
* quote fieldnames in _adodb_getupdatesql, fix indentations
* Fix my own conflict edits
Co-authored-by: Mark Newnham <mark@newnhams.com>
|
|
|
|
|
|
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.
|
|
statements #549
If the SQL statement passed to adodb_strip_order contains multiple order by statements, the incorrect one is stripped. This change ensures that only the last one is stripped
Co-Authored-By: mustafa-soner-acar <mustafa-soner-acar@users.noreply.github.com>
|
|
# Conflicts:
# adodb-lib.inc.php
|
|
Create 2 new internal functions
- _adodb_getmenu_select() to print the SELECT tag, and
- _adodb_getmenu_option() to print the OPTION tags
and call them from _adodb_getmenu() / _adodb_getmenu_gp().
|
|
- Whitespace
- Coding guidelines
- Remove unused variables
- Remove empty if statements
- Optimization
|
|
Commit 61c5a8cf0ea9df2777eed7d1bb7935593aa93545 (see #460) introduced a
regression in the behavior of getMenu() when ADODB_FETCH_MODE is set to
ADODB_FETCH_BOTH, causing it to use the recordset's first column for
both the select options' value and description.
Fixes #482
|
|
|
|
Slightly more efficient code and removes PHPStorm warning about
uninitialized variable.
|
|
|
|
|
|
|
|
# Conflicts:
# adodb-lib.inc.php
# adodb-time.inc.php
|
|
|
|
Methods getMenu and getMenu3 throw E_NOTICE errors when ADODB_FETCH_MODE = ADODB_FETCH_ASSOC See #460. This enhancement adds support for this feature.
|
|
The getMenu and getMenu3 methods generate E_NOTICE errors when ADODB_FETCH_MODE is set to ADODB_FETCH_ASSOC See #460. This changes adds support for that.
|
|
Code missing from the _adodb_getupdatesql() method, added
|
|
# Conflicts:
# adodb-time.inc.php
# docs/changelog.md
# drivers/adodb-mssql.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-oci8po.inc.php
|
|
|
|
|
|
|
|
SQL Server requires an alias when creating a count statement.
This true for Native Mode(mssqlnative), mssql and PDO drivers
|
|
SQL Server requires an alias when creating a count statement.
This true for Native Mode(mssqlnative), mssql and PDO drivers
|
|
|
|
|
|
|
|
|
|
|
|
Currently the _ADODB_ALIAS_ is only used for postgres and mysql, but
it's also necessary for mssql, otherwise the query assigned to
$rewritesql on line 422 fails and produces the following warning:
PHP Warning (2): mssql_query(): message: Incorrect syntax near ')'.
(severity 15) in /usr/share/php/adodb/drivers/adodb-mssql.inc.php on
line 832
Fixes #359
Signed-off-by: Damien Regad <dregad@mantisbt.org>
Original commit amended to split long line.
|
|
|
|
|
|
The ADOdb Extension's development stopped at version 5.04. It is no
longer maintained or supported, yet the library still contains code
referencing it. If those code branches are executed, ADOdb will not
perform properly, due to missing constant declarations (among other
things).
This commit removes all references to the Extension.
Fixes #270, #269
|