summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
AgeCommit message (Collapse)AuthorFilesLines
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-47/+43
2012-03-04Merged conflicts.Phil Sturgeon1-7/+7
2012-03-03Merge upstream branchAndrey Andreev1-21/+29
2012-03-03Added _optimize_table() support for PostgreSQLAndrey Andreev1-1/+1
2012-03-03Improve DB version() implementation and add pg_version() supportAndrey Andreev1-21/+25
2012-03-02Merge upstreamTimothy Warren1-12/+10
2012-03-02Replaced DB methods _error_message() and _error_number() with error() (issue ↵Andrey Andreev1-12/+10
#1097)
2012-03-01compile binds before caching the query, otherwise the cached query will ↵Ryan Dial1-6/+6
never match the unbound query. updated changlog to mention bug fix.
2012-03-01Merge upstream branchAndrey Andreev1-14/+8
2012-03-01Merge upstream branchAndrey Andreev1-4/+4
2012-03-01Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren1-6/+5
2012-03-01Merge upstream changesAndrey Andreev1-8/+19
2012-03-01Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren1-8/+3
2012-03-01Merge upstream branchAndrey Andreev1-2/+2
2012-03-01Fix issue #1036 (is_write_type() returned FALSE for RENAME, OPTIMIZE queries)Andrey Andreev1-9/+4
2012-02-29Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren1-0/+16
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-db-oci8Andrey Andreev1-0/+16
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-db-driverAndrey Andreev1-0/+16
2012-02-29Merged in 2.1-stable changes.Phil Sturgeon1-1/+17
2012-02-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-24/+10
2012-02-27Fixed a db_set_charset() bugAndrey Andreev1-6/+5
2012-02-22Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren1-24/+10
2012-02-22Merge upstream branchAndrey Andreev1-24/+10
2012-02-22Merge upstream branchAndrey Andreev1-14/+7
2012-02-22Fix issue 1070Andrey Andreev1-24/+10
2012-02-19Renaming Active Record to Query Builder across the systemJamie Rumbelow1-2/+2
2012-02-16narfbg suggested fixesTimothy Warren1-1/+1
2012-02-13Fix issue #1036Andrey Andreev1-1/+1
2012-02-13Fix a possible bug in DB() and renamed a variableAndrey Andreev1-0/+1
2012-02-10Merge upstream branchAndrey Andreev1-14/+13
2012-02-10Merge upstream branchAndrey Andreev1-2/+0
2012-02-09Fixed PDOTaufan Aditya1-14/+13
2012-02-08Revert CI_DB_driver changes (see #971)Andrey Andreev1-116/+171
2012-01-27Merge upstream branchAndrey Andreev1-1/+1
2012-01-27Removed a few more unnecessary linesAndrey Andreev1-9/+2
2012-01-27Merge remote-tracking branch 'upstream/develop' into develop-db-driverAndrey Andreev1-1/+1
2012-01-27Improve the MySQLi database driverAndrey Andreev1-1/+1
2012-01-26Fix a comment typoAndrey Andreev1-1/+1
2012-01-25Add better key/index detection for list_tables() and list_fields()Andrey Andreev1-2/+48
2012-01-25Pass CI_DB_driver::curs_id to CI_DB_oci8_result ...Andrey Andreev1-1/+1
2012-01-25Improve the base database driver classAndrey Andreev1-313/+189
2012-01-20Replaced AND with &&Andrey Andreev1-29/+24
2012-01-05Fix a method descriptionAndrey Andreev1-1/+1
2012-01-05Numerous improvements to the Oracle (oci8) driver and DB_driverAndrey Andreev1-147/+95
2012-01-02Updating copyright date to 2012Greg Aker1-1/+1
2011-12-26Merge pull request #709 from tubalmartin/2.1-stablePhil Sturgeon1-0/+14
2.1.0 - Fatal error: Call to undefined method CI_DB_Driver::_reset_select()
2011-12-01This fixes issue #725Repox1-2/+8
2011-12-01This fixes issue #725Repox1-1/+8
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort1-5/+32
The DB_driver can now use failover databases if specified. If the main connection shouldn't connect for some reason the DB_driver will now try to connect to specified connections in the failover config. Example config: $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; $db['default']['char_set'] = 'utf8'; $db['default']['dbcollat'] = 'utf8_general_ci'; $db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; $db['default']['failover'] = array(); $db['default']['failover'][0]['hostname'] = 'localhost1'; $db['default']['failover'][0]['username'] = ''; $db['default']['failover'][0]['password'] = ''; $db['default']['failover'][0]['database'] = ''; $db['default']['failover'][0]['dbdriver'] = 'mysql'; $db['default']['failover'][0]['dbprefix'] = ''; $db['default']['failover'][0]['pconnect'] = TRUE; $db['default']['failover'][0]['db_debug'] = TRUE; $db['default']['failover'][0]['cache_on'] = FALSE; $db['default']['failover'][0]['cachedir'] = ''; $db['default']['failover'][0]['char_set'] = 'utf8'; $db['default']['failover'][0]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][0]['swap_pre'] = ''; $db['default']['failover'][0]['autoinit'] = TRUE; $db['default']['failover'][0]['stricton'] = FALSE; $db['default']['failover'][0]['failover'] = array(); $db['default']['failover'][1]['hostname'] = 'localhost2'; $db['default']['failover'][1]['username'] = ''; $db['default']['failover'][1]['password'] = ''; $db['default']['failover'][1]['database'] = ''; $db['default']['failover'][1]['dbdriver'] = 'mysql'; $db['default']['failover'][1]['dbprefix'] = ''; $db['default']['failover'][1]['pconnect'] = TRUE; $db['default']['failover'][1]['db_debug'] = TRUE; $db['default']['failover'][1]['cache_on'] = FALSE; $db['default']['failover'][1]['cachedir'] = ''; $db['default']['failover'][1]['char_set'] = 'utf8'; $db['default']['failover'][1]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][1]['swap_pre'] = ''; $db['default']['failover'][1]['autoinit'] = TRUE; $db['default']['failover'][1]['stricton'] = FALSE; $db['default']['failover'][1]['failover'] = array(); Signed-off-by: Felix Balfoort <fhjbalfoort@gmail.com>
2011-11-24Added dummy _reset_select() method to CI_DB_Driver class to allow Active ↵Túbal Martín1-0/+14
Record class to be disabled. Otherwise a fatal error is triggered.