adodb/drivers/adodb-fbsql.inc.php, branch v5.22.11-lscadodb PHP Database Abstraction Layer
https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc2023-04-29T23:00:55ZDefine ADOConnection::_query() method2023-04-29T23:00:55ZDamien Regaddregad@mantisbt.org2023-04-29T23:00:55Zurn:sha1:ae2438b731d24bf0bb159a738599b9266120e96e
- Update child classes to be consistent with this declaration.
- Remove unnecessary, non-PHPDoc comments
- Consistent parameter names
Fixes #966
Fix syntax error2021-08-24T00:01:00ZDamien Regaddregad@mantisbt.org2021-08-24T00:01:00Zurn:sha1:fbbac2b0c3ee070cf54a3afca6c89a0d5c1b477d
Caused by incorrectly resolved merge conflict
507466ef798b18a3a8830230cfcd51bb488513cf.
Fix Whitespace, coding guidelines, PHPDoc2021-08-23T23:56:33ZDamien Regaddregad@mantisbt.org2021-08-23T23:56:33Zurn:sha1:f988527f4e481ca56d6e02b09663f5a9e3bcddd1Redo Merge branch 'hotfix/5.21' Standardized file headers2021-08-16T22:48:04ZDamien Regaddregad@mantisbt.org2021-08-16T22:48:04Zurn:sha1:d558d101c514beeb8c91f65ae61d106b201dc472
Try to do it right this time...
# Conflicts:
# adodb-memcache.lib.inc.php
Fixes #751
Reset version to avoid merge conflicts2021-08-16T22:31:23ZDamien Regaddregad@mantisbt.org2021-08-16T22:31:23Zurn:sha1:eea4fc59246a14083e07949e4d54ac806ebbacce
Fixes #751
Revert changes since Standardized file headers merge2021-08-16T22:30:04ZDamien Regaddregad@mantisbt.org2021-08-16T22:30:04Zurn:sha1:507466ef798b18a3a8830230cfcd51bb488513cf
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
Standard file header: /drivers2021-08-14T11:09:22ZDamien Regaddregad@mantisbt.org2021-04-30T17:13:11Zurn:sha1:19bc8246a34a7b949c6d87d7390ea1af47a8e503Add stub for ADOConnection::_insertID()2021-04-11T08:25:06ZDamien Regaddregad@mantisbt.org2021-03-27T10:40:14Zurn:sha1:9d76d494493d7710dd4b85f434d104dc2def531e
Update child classes so method signature matches the parent's.
Bump version to 5.21.1-dev2021-03-08T17:38:28ZDamien Regaddregad@mantisbt.org2021-03-08T17:38:28Zurn:sha1:27a03b4aa9f01924741c77d8fbe0df3d44374cefBump version to 5.21.02021-02-27T11:38:53ZDamien Regaddregad@mantisbt.org2021-02-27T11:38:53Zurn:sha1:199391f639a0b3346a80d66c00c87230fa3e6a07