summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2017-07-13add is_write_type method for merge queryytetsuro1-1/+1
Signed-off-by: tetsuro yoshikawa <phper.0o0@gmail.com>
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>
2017-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev16-23/+23
Spelling fixes in comment blocks and docs
2017-01-17Address #4980Andrey Andreev1-13/+14
2017-01-17Add aliased tables cache.tianhe19861-17/+23
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-16spelling fixesklemens16-23/+23
2017-01-10Merge branch '3.1-stable' into developAndrey Andreev2-2/+2
Conflicts resolved: system/core/CodeIgniter.php 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/email_helper.php system/helpers/smiley_helper.php system/libraries/Cart.php system/libraries/Email.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php user_guide_src/source/changelog.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Merge pull request #4962 from ytetsuro/patch-2Andrey Andreev1-1/+2
oci8_forge add column bug fix
2017-01-05add empty line priorytetsuro1-1/+1
add empty line prior
2017-01-05oci8_forge add column bug fixytetsuro1-1/+2
Notice Error Array to string conversion $this->dbforge->add_column('sample', [ 'column_name1' => [ 'type' => 'char', 'default' => '0' ], 'column_name2' => [ 'type' => 'char', 'default' => '0' ] ]);
2017-01-03Fix #4804Andrey Andreev1-1/+1
2017-01-03Merge pull request #4958 from boxsnake/developAndrey Andreev1-1/+1
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby
2017-01-03Merge pull request #4958 from boxsnake/developAndrey Andreev1-1/+1
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby
2017-01-03[ci skip] Fix 4953Andrey Andreev1-1/+1
2017-01-03[ci skip] Update year number in remaining files that were recently deleted ↵Andrey Andreev4-8/+8
from develop
2017-01-03Update copyright data to 2017Master Yoda75-150/+150
2016-12-31Update copyright data to 2017Master Yoda75-150/+150
2016-12-231. Updated last comit with comment for ↵Alex Fang1-1/+1
https://github.com/bcit-ci/CodeIgniter/pull/4955
2016-12-22Fix bug: DB_query_builder do not add parenthesis for cached group_byAlex Fang1-1/+1
2016-12-14Drop all PHP 5.3-related codeAndrey Andreev6-772/+1
2016-12-14Merge branch '3.1-stable' into developAndrey Andreev5-105/+27
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-13 09:26:57 +0100