summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
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
2016-07-26Merge branch '3.1-stable' into developAndrey Andreev19-140/+182
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-07-22Fix #4713Andrey Andreev1-4/+9
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-26Fix #4647Andrey Andreev1-1/+1
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 Andreev2-27/+35
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-02-29Merge pull request #4495 from galdiolo/patch-15Andrey Andreev1-1/+1
[ci skip] Fix a comment typo
2016-02-29[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-11Fix #4449Andrey Andreev1-26/+34
2016-02-09Merge branch '3.0-stable' into developAndrey Andreev2-15/+14
Fixed conflicts: user_guide_src/source/overview/at_a_glance.rst
2016-02-09Merge pull request #4445 from damiengrandi/developAndrey Andreev1-9/+9
[ci skip] Update QB phpdoc returns
2016-02-09fix a typo editDamien Grandi1-1/+1
2016-02-09Revert some previous changesDamien Grandi1-3/+3
2016-02-09Update DB_query_builder.php - phpdoc (some incorrect return type)Damien Grandi1-12/+12
Edit of some return type in phpdoc. This can also help to fix some autocompletion troubles in some IDE.
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-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-04Add batch_size param to insert_batch(), update_batch()Andrey Andreev1-6/+6
This should resolve #42
2016-01-27Fix #4401Andrey Andreev1-4/+4
2016-01-26Merge branch '3.0-stable' into developAndrey Andreev1-16/+43
2016-01-26Fix #4399Andrey Andreev1-15/+28
2016-01-25Fix #4395Andrey Andreev1-1/+15
2016-01-11[ci skip] Merge branch '3.0-stable' into developAndrey Andreev79-79/+79
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev79-79/+79
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev79-158/+158
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev79-158/+158
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev79-158/+158
2016-01-11[ci skip] Bump year to 2016Andrey Andreev79-158/+158
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev9-28/+167
Resolved conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php
2016-01-11Merge pull request #4369 from galdiolo/patch-12Andrey Andreev1-10/+6
Optimize transactions check in CI_DB_driver::query()
2016-01-08use 'while' instead of 'if' 'do' 'while'Claudio Galdiolo1-10/+6
2016-01-07MySQL stricton again ... remove the version conditionAndrey Andreev3-3/+3
Ref: #4349