summaryrefslogtreecommitdiffstats
path: root/system/database/drivers
AgeCommit message (Collapse)AuthorFilesLines
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
2016-08-10Merge branch '3.1-stable' into developAndrey Andreev3-19/+6
2016-07-28Remove dead code written for PHP 5.2Andrey Andreev3-19/+6
2016-07-26Merge branch '3.1-stable' into developAndrey Andreev18-135/+172
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst
2016-07-26Fix SQLi in ODBC driversAndrey Andreev2-124/+118
2016-06-28[ci skip] Add changelog entries for PR #4678Andrey Andreev2-2/+0
2016-06-28Merge pull request #4678 from kenjis/fix-oci8_forgeAndrey Andreev2-4/+69
DBForge adjustments for Oracle
2016-06-28Remove duplicated $_create_table_ifkenjis1-7/+0
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-06-27Fix oci8_forgekenjis2-0/+72
* Oracle does not have `create table if exists` * Oracle has only NUMBER for integer Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-06-22Fix #4674Andrey Andreev2-2/+10
2016-06-08Make db_select() clear cached database metadataAndrey Andreev5-0/+5
2016-05-25[ci skip] Add 'LONGTEXT' to 'STRING' alias to CUBRID drivers for DBForgeAndrey Andreev2-0/+6
Requested in #4640
2016-05-25Amend fix for #4637Andrey Andreev1-1/+1
2016-05-19[ci skip] Fix #4637Andrey Andreev1-7/+13
2016-04-01[ci skip] Fix #861 (regression)Andrey Andreev4-0/+20
2016-03-11Merge branch '3.0-stable' into developAndrey Andreev1-1/+1
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
2016-03-07[ci skip] Fix transactions for the ibase driverAndrey Andreev1-1/+1
Reported via the forums: http://forum.codeigniter.com/thread-64559.html
2016-01-11[ci skip] Merge branch '3.0-stable' into developAndrey Andreev72-72/+72
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev72-72/+72
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev72-144/+144