summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2019-09-25Fix indentsapics6-10/+10
2019-09-22Merge pull request #5834 from najdanovicivan/qb-count-having-fixAndrey Andreev1-1/+1
Fix count_all_result if QB query contains HAVING clause
2019-09-19Merge branch '3.1-stable' into developAndrey Andreev6-6/+6
Conflicts resolved: system/core/CodeIgniter.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Session/drivers/Session_redis_driver.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
2019-09-13Fix count_all_result if QB query contains HavingNajdanovic Ivan1-1/+1
Signed-off-by: Najdanovic Ivan <najdanovicivan@gmail.com>
2019-07-16Fix #5796Andrey Andreev3-3/+3
2019-07-15[ci skip] Fix #5788Andrey Andreev1-1/+1
2019-06-19Fix #5774Andrey Andreev1-1/+1
2019-02-26[ci skip] Fix #5701Andrey Andreev1-1/+1
2019-02-14[ci skip] More on #4186Andrey Andreev1-2/+7
2019-02-14Close #4186, #5631, #5668Andrey Andreev1-15/+10
2019-02-14Merge branch '3.1-stable' into developAndrey Andreev5-8/+15
2019-02-14[ci skip] Polish changes from PR #5692, apply them to pdo/oci and add a ↵Andrey Andreev2-5/+12
changelog entry
2019-02-14[ci skip] Merge pull request #5692 from ytetsuro/patch-2Andrey Andreev1-0/+7
Fixed bug that can not be changed from not null to null in oci.
2019-02-12feat: add _null propertyytetsuro1-0/+7
2019-01-25[ci skip] Fix #5681Andrey Andreev3-3/+3
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev8-48/+40
Conflicts resolved: system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst
2019-01-02Merge pull request #5662 from jim-parry/copyright2019Instructor, BCIT79-233/+233
Update copyright date to 2019
2018-12-27Update copyright date to 2019Jim Parry75-150/+150
2018-11-16[ci skip] Fix #5627Andrey Andreev1-1/+1
2018-11-16[ci skip] Fix #5624Andrey Andreev3-27/+9
2018-09-11[ci skip] Fix #5587Andrey Andreev1-1/+4
2018-08-22[ci skip] Close #5513Andrey Andreev1-0/+5
2018-08-22[ci skip] Fix #5561Andrey Andreev1-16/+18
2018-07-26More on #5542Andrey Andreev1-1/+1
2018-07-22[ci skip] Fix #5542Andrey Andreev2-2/+2
2018-05-18http:// to https://Mehdi Bounya75-150/+150
2018-04-24Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
2018-04-23[ci skip] Merge pull request #5471 from toonitw/patch-1Andrey Andreev2-3/+3
The value of limit can be zero
2018-04-23[ci skip] Merge pull request #5471 from toonitw/patch-1Andrey Andreev2-3/+3
The value of limit can be zero
2018-04-18Remove the extra parenthesesJehong Ahn2-2/+2
2018-04-14Merge pull request #5464 from ytetsuro/fix/#5462/like-before-bugAndrey Andreev1-1/+1
Fixed issue #5462 Query Builder LIKE BEFORE doesnt work
2018-04-13Fix #5448Andrey Andreev1-1/+1
2018-04-12qb_limit can be zeroJehong Ahn2-3/+3
2018-04-03fix: It does not work properly when like is beforeytetsuro1-1/+1
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev3-28/+45
Conflicts resolved: system/core/CodeIgniter.php system/core/Security.php system/database/DB_query_builder.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
2018-03-15[ci skip] Fix #5435Andrey Andreev1-1/+14
2018-02-28[ci skip] Fix 5423Andrey Andreev1-4/+3
2018-01-30Fix a QB bug where where(), having() treated values passed to them as ↵Andrey Andreev1-23/+28
arbitrary SQL
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev79-158/+158
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-09Annual copyright updateMaster Yoda75-150/+150
2017-12-27Merge pull request #5367 from carusogabriel/clean-elsesAndrey Andreev2-9/+6
Clean elses
2017-12-20Add extra line before returnGabriel Caruso1-0/+1
2017-12-20Clean elsesGabriel Caruso2-9/+5
2017-10-16Merge branch '3.1-stable' into developAndrey Andreev4-21/+13
2017-10-13Fix #5297Andrey Andreev1-4/+8
2017-10-03Update DB_query_builder.phppgee701-1/+1
recent changes broke query ordering giving a warning in line 1238 = '$this->qb_cache_orderby = array_merge($this->qb_cache_orderby, $qb_orderby);' this was because on subsequent re-queries, the qb_cache_orderby was set to NULL not Array() as it is should be (and is instantiated originally .
2017-09-27Fix #5276Andrey Andreev2-16/+4
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev8-17/+72
2017-09-13Fix #5260Andrey Andreev2-5/+61
2017-09-04Fix #5246Andrey Andreev1-0/+1