summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2018-01-09Annual copyright updateMaster Yoda75-150/+150
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
2017-08-31Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-versionAndrey Andreev1-0/+16
Fix for DBLIB subdriver to get the right version number of SQL Server.
2017-08-31Refactoring some codeblocks.Andrei Rosseti1-26/+15
2017-08-30Fixed DBLIB subdriver to get the right version number of SQL Server.Andrei Rosseti1-0/+27
2017-08-29Optimize the join() type regexp and remove the extra leading space when no ↵Andrey Andreev1-3/+3
special join-type is used
2017-08-29Polish changes from & add changelog entry for PR #5242Andrey Andreev1-29/+8
Also, further simplified the join() logic
2017-08-29remove unnecessary empty linesShang Ning1-2/+0
2017-08-29add NATURAL JOIN types to fix #5240Shang Ning1-4/+20
2017-08-25[ci skip] Fix #5236Andrey Andreev4-4/+4
2017-07-14[ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_typeAndrey Andreev1-1/+1
add is_write_type method for merge query
2017-07-13add is_write_type method for merge queryytetsuro1-1/+1
Signed-off-by: tetsuro yoshikawa <phper.0o0@gmail.com>
2017-07-10[ci skip] Fix #5178 (regression caused by #5168)Andrey Andreev1-1/+1
2017-07-03[ci skip] Fix #5168Andrey Andreev1-8/+6
2017-06-22Close #4134: Allow dots in alias names detected by QBAndrey Andreev1-10/+13
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.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
2017-06-15Merge pull request #5155 from tianhe1986/develop_count_ignore_limitAndrey Andreev1-1/+1
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET
2017-06-15Getting right num of rows with LIMIT usage.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-15Revert "Ignore LIMIT when using CI_DB_query_builder::count_all_results"tianhe19861-21/+3
This reverts commit 9f6da3c2f11535fee09dd306ae6b884168e4623b. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-15Ignore LIMIT when using CI_DB_query_builder::count_all_resultstianhe19861-3/+21
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-13[ci skip] Apply PR #5150 patch to pdo/oci and add changelog entryAndrey Andreev1-1/+1
2017-06-13[ci skip] Merge pull request #5150 from ↵Andrey Andreev1-1/+1
ytetsuro/add-oracle-rename-column-to-keyword Fix DBForge triggering ORA-00946 while renaming columns
2017-06-13add rename to keywordytetsuro1-1/+1
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev2-4/+4
Fix misc inconsistencies between code and doc comments
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre2-4/+4
2017-05-10Merge pull request #5112 from cerealbeer/developAndrey Andreev1-1/+1
read() in DB_cache fails when catching E_WARNING with custom error handler
2017-05-10Removing the error suppression op from the file_get_contents() call.Giuseppe Marcelli1-1/+1
2017-05-10Revert "Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow ↵Giuseppe Marcelli1-1/+1
anymore to use the custom result object against cached database results, fixing this, for more info see issue 4665,1351" This reverts commit 8233b1d6fc56347195b3a0411806e197e2e59ad3.
2017-05-10Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to ↵Giuseppe Marcelli1-1/+1
use the custom result object against cached database results, fixing this, for more info see issue 4665,1351
2017-05-09read() in DB_cache does not fail when catching E_WARNING with custom error ↵Giuseppe Marcelli1-1/+1
handler
2017-03-24Merge branch '3.1-stable' into developAndrey Andreev12-26/+27
Conflicts resolved: system/core/CodeIgniter.php system/core/Common.php system/core/Input.php system/helpers/cookie_helper.php tests/codeigniter/helpers/html_helper_test.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 user_guide_src/source/libraries/input.rst
2017-03-20Fix #5057Andrey Andreev1-2/+2
2017-03-14Fix #5050Andrey Andreev10-11/+11
2017-02-21Merge pull request #5017 from tianhe1986/develop_having_inAndrey Andreev1-15/+94
DB_query_builder: Adding having_in(), or_having_in(), having_not_in() and or_having_not_in()
2017-02-20Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-02-16Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-02-13Adding having_in(), or_having_in(), having_not_in() and or_having_not_in().tianhe19861-0/+72
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-13Using _wh_in() instead of _where_in().tianhe19861-15/+22
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-17Merge pull request #4987 from tianhe1986/develop_qb_alias_table_cacheAndrey Andreev1-9/+15
Add aliased tables cache in query_builder.
2017-01-17Merge pull request #4987 from tianhe1986/develop_qb_alias_table_cacheAndrey Andreev1-9/+15
Add aliased tables cache in query_builder.
2017-01-17Format fix。tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-171 Keep just 'list'.tianhe19861-13/+13
2 Using strict mode with in_array(). 3 Do not re-align. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-07-03 17:59:35 +0200