summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
AgeCommit message (Collapse)AuthorFilesLines
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-03-24Merge branch '3.1-stable' into developAndrey Andreev1-13/+14
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-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 Andreev1-2/+2
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 fixesklemens1-2/+2
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-03Update copyright data to 2017Master Yoda1-2/+2
2016-12-12Fix #4892 - update_batch()Andrey Andreev1-10/+19
Regression caused by 0c23e9122666a30797079bea9415da135d4f7e12 trying to fix #4871 Supersedes #4929
2016-10-28Fix #4884Andrey Andreev1-1/+1
2016-10-27Fix #4871Andrey Andreev1-3/+5
2016-07-29Fix #4737Andrey Andreev1-2/+2
2016-07-22Fix #4713Andrey Andreev1-4/+9
2016-05-26Fix #4647Andrey Andreev1-1/+1
2016-02-29Merge pull request #4495 from galdiolo/patch-15Andrey Andreev1-1/+1
[ci skip] Fix a comment typo
2016-02-11Fix #4449Andrey Andreev1-26/+34
2016-02-09Merge pull request #4445 from damiengrandi/developAndrey Andreev1-9/+9
[ci skip] Update QB phpdoc returns
2016-02-05Fix another regression caused by 805eddaefd9503b5dbbd924bd6da66e29c4768f3Andrey Andreev1-3/+3
Also added a unit test for #4431
2016-02-05Fix a regression caused by 805eddaefd9503b5dbbd924bd6da66e29c4768f3Andrey Andreev1-2/+2
2016-02-05Fix #4431Andrey Andreev1-5/+4
2016-02-04Add batch_size param to insert_batch(), update_batch()Andrey Andreev1-6/+6
This should resolve #42
2016-01-26Fix #4399Andrey Andreev1-15/+28
2016-01-25Fix #4395Andrey Andreev1-1/+15
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev1-1/+1
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev1-2/+2
2016-01-11[ci skip] Bump year to 2016Andrey Andreev1-2/+2
2015-11-04Fix #4212Andrey Andreev1-1/+1
2015-09-01Fix #4093Andrey Andreev1-1/+1
2015-07-31Fix #4012Andrey Andreev1-1/+4
2015-07-29Fix a 'counter-#3989' bugAndrey Andreev1-5/+15
The issue described in #3989 is actually the opposite of what has beent the intended behavior for the parameter in all Query Builder methods. Unfortunately, there's been a huge misunderstanding about that and half the methods worked properly, while the other half did not ... fixing that here. Also related: #4001
2015-07-27Revert "Fix an internal bug in QB where() escaping"Andrey Andreev1-1/+4
This reverts commit 43afc71b777b00cfc2638add6fa3c47d333c5e04.
2015-07-27Revert "Fix #3989"Andrey Andreev1-4/+11
This reverts commit e1a94d30e2f30cee36f71c246136fb2db34d25df.
2015-07-24Fixed typosCalvin Tam1-1/+1
2015-07-21Fix #3989Andrey Andreev1-11/+4
More instances of the bug that was fixed with 43afc71b777b00cfc2638add6fa3c47d333c5e04
2015-07-20Fix #3279Andrey Andreev1-4/+4
2015-07-20Fix an internal bug in QB where() escapingAndrey Andreev1-4/+1
This is not a supported use case, but if QB escaping is force-disabled, string values passed to where() or having() aren't escaped. That's wrong because escape-disabling should only be possible for identifiers and not values. Reported via the forums: http://forum.codeigniter.com/thread-62478.html
2015-07-02Fix QB delete() for multiple tables with where()Andrey Andreev1-0/+3
Reported via the forums: http://forum.codeigniter.com/thread-61774.html
2015-06-29Fix regression caused by 59d1ffd927ef3b63dbadf42e1caf14957201fd2dAndrey Andreev1-1/+1
2015-06-29Fix #3932Andrey Andreev1-1/+1
2015-04-08[ci skip] Fix comment typosAndrey Andreev1-1/+1
https://github.com/bcit-ci/CodeIgniter/pull/3748#issuecomment-90925762
2015-04-06Move strtolower() call from PR #3739 out of the loopAndrey Andreev1-3/+2