summaryrefslogtreecommitdiffstats
path: root/system/database/drivers
AgeCommit message (Collapse)AuthorFilesLines
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev2-5/+17
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-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev72-144/+144
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-09Annual copyright updateMaster Yoda68-136/+136
2017-10-16Merge branch '3.1-stable' into developAndrey Andreev2-16/+4
2017-09-27Fix #5276Andrey Andreev2-16/+4
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev6-9/+65
2017-09-13Fix #5260Andrey Andreev2-5/+61
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-25[ci skip] Fix #5236Andrey Andreev4-4/+4
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-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 Andreev1-1/+1
Fix misc inconsistencies between code and doc comments
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre1-1/+1
2017-03-24Merge branch '3.1-stable' into developAndrey Andreev11-13/+13
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-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev14-20/+20
Spelling fixes in comment blocks and docs
2017-01-16spelling fixesklemens14-20/+20
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-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 Yoda68-136/+136
2016-12-31Update copyright data to 2017Master Yoda68-136/+136
2016-12-14Drop all PHP 5.3-related codeAndrey Andreev6-772/+1
2016-12-14Merge branch '3.1-stable' into developAndrey Andreev4-95/+8
2016-12-12Fix #4892 - update_batch()Andrey Andreev4-95/+8
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-10-31Merge pull request #4893 from tianhe1986/develop_fix_dbdriver_quoteAndrey Andreev1-1/+1
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.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev1-1/+1
Detect double-quoted strings in DB::compile_binds()
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev1-1/+1
Detect double-quoted strings in DB::compile_binds()
2016-10-28Merge branch '3.1-stable' into developAndrey Andreev12-12/+94
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 both single and double quote in compile_binds().tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-17Fix #4851Andrey Andreev5-8/+8
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