summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
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
2016-01-07Fix MySQL errors from latest commitsAndrey Andreev3-3/+3
Ref: #4349
2016-01-07Add MySQL stricton changes to mysqli and pdo/mysql driversAndrey Andreev3-20/+55
2016-01-07Fix MySQL's 'stricton' featureAndrey Andreev1-2/+20
2016-01-07Add support for MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERTAndrey Andreev1-2/+15
Available since PHP 5.6.16
2016-01-07[ci skip] Add Oracle 12.1 OFFSET support to PDO_OCI as wellAndrey Andreev1-0/+8
Reference: #4279
2016-01-06[ci skip] Add support for OFFSET with Oracle 12cAndrey Andreev1-0/+8
As requested in #4279
2016-01-06Fix #4337Andrey Andreev4-2/+48
2015-12-30Fix #4331Andrey Andreev1-13/+24
2015-12-14Fix erroneous variables from 85bc9fc53e4c3e46b2f4e1b1eac7e2828d4869e6Andrey Andreev3-4/+4
2015-12-14Change DB charset handlingAndrey Andreev5-85/+32
Close #4311
2015-12-14Merge branch '3.0-stable' into developAndrey Andreev6-8/+43
2015-12-14Fix version() for Oracle DB driversAndrey Andreev2-2/+29
2015-12-14Close #4313Andrey Andreev1-0/+12
2015-12-12Complete the proposed changes from PR #4300Andrey Andreev1-16/+3
2015-12-12Merge branch 'develop' of github.com:halmai/CodeIgniter into db/init_exceptionAndrey Andreev1-1/+1
2015-12-11Fix #4306Andrey Andreev1-1/+1
2015-12-08Remove CI_DB_driver::load_rdriver()Andrey Andreev2-25/+7
2015-12-08Type-hint csv_from_result(), xml_from_result() DB utilitiesAndrey Andreev1-12/+2
Close #4299
2015-12-08rolling back previous solution; throwing exception if database connection ↵Halmai, Csongor1-1/+1
was not successful.
2015-11-24[ci skip] Remove some redundant code from DB_forgeAndrey Andreev1-4/+0