summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
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-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
2016-12-12Fix #4892 - update_batch()Andrey Andreev5-105/+27
Regression caused by 0c23e9122666a30797079bea9415da135d4f7e12 trying to fix #4871 Supersedes #4929
2016-12-12Merge pull request #4941 from aquilax/fix-pdo-sqlite-order_by-randAndrey Andreev1-1/+1
Fix order_by() random for pdo/sqlite driver
2016-12-10`_random_keyword` must be arrayaquilax1-1/+1
Signed-off-by: aquilax <aquilax@gmail.com>
2016-11-23[ci skip] Styling change after 21b7a2a2d00bd5645b2ca1afcfa4098e207292a4Andrey Andreev1-2/+2
2016-11-22Add support for CURRENT_TIMESTAMP (and similar) defaults to date/time fields ↵Andrey Andreev1-12/+24
in DB Forge As requested in #4852
2016-10-31Merge pull request #4893 from tianhe1986/develop_fix_dbdriver_quoteAndrey Andreev2-2/+2
Fix compile_binds: do not use back references inside a character class.
2016-10-31Fix compile_binds: do not use back references inside a character class.tianhe19862-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev2-2/+2
Detect double-quoted strings in DB::compile_binds()
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev2-2/+2
Detect double-quoted strings in DB::compile_binds()
2016-10-28Revert "Match single quote in is_write_type()."tianhe19861-1/+1
This reverts commit eef5951ae313c2c4080e94b8c1aa743a6d6c93b7. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Merge branch '3.1-stable' into developAndrey Andreev15-19/+103
Resolved conflicts: system/core/CodeIgniter.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/form_validation.rst
2016-10-28Match single quote in is_write_type().tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Match both single and double quote in compile_binds().tianhe19862-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Fix #4884Andrey Andreev1-1/+1
2016-10-27Fix #4871Andrey Andreev1-3/+5
2016-10-22Allow binding 0, null out of array in query()Andrey Andreev1-1/+1
2016-10-17Fix #4851Andrey Andreev6-10/+10
2016-09-27Fix #4809Andrey Andreev1-0/+49
2016-09-16[ci skip] Don't try to insert_batch() when we know it's not supported on ↵Andrey Andreev2-0/+33
Firebird
2016-09-16[ci skip] Fix #4808Andrey Andreev4-4/+4
2016-09-09Merge pull request #4805 from intekhabrizvi/developAndrey Andreev1-1/+1
Use MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT as a connection flag instead of option
2016-09-09Removed mysqli options function for ssl certificate verification falseintekhab1-1/+0
2016-09-09supplied flag to turn off mysqli SSL verification if ssl_verify passed as falseintekhab1-0/+1
2016-08-10Merge branch '3.1-stable' into developAndrey Andreev4-21/+8
2016-08-01Merge pull request #4742 from masterklavi/db_fetch_objectAndrey Andreev1-1/+1
Change ... for the sake of change
2016-07-31Changed the return value of CI_DB_result::_fetch_object(..) to objectMasterklavi1-1/+1
2016-07-29Fix #4737Andrey Andreev1-2/+2
2016-07-28Remove dead code written for PHP 5.2Andrey Andreev3-19/+6
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-07-14 09:28:02 +0200