summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
AgeCommit message (Collapse)AuthorFilesLines
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-235/+172
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
2012-03-06Move dsn property from the PDO to CI_DB_driver so other DB drivers can use ↵Andrey Andreev1-0/+1
it without declaring it
2012-03-06Just some comment fixes and cleared spacesAndrey Andreev1-33/+27
2012-03-06Property visibility declarations for CI_DB_driverAndrey Andreev1-40/+35
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev1-26/+8
2012-03-06Made _protect_identifiers publicTimothy Warren1-1/+4
2012-03-06Made protect_identifiers publicTimothy Warren1-1/+1
2012-03-06Added visibility keywords to DB_driver methodsTimothy Warren1-70/+38
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to ↵Andrey Andreev1-20/+2
DB_result to handle initialization
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-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 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-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-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-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-09Fixed PDOTaufan Aditya1-14/+13
2012-01-27Improve the MySQLi database driverAndrey Andreev1-1/+1
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.
2011-11-22Updated trans_start() and trans_complete() so that _trans_depth increments ↵Jacob Terry1-0/+5
correctly Fix for issue #159 and #163.
2011-10-27Converted database constructors to PHP5 typeTimothy Warren1-2/+2
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones1-4/+16
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
2011-10-10Converted database constructors to PHP5 typeTimothy Warren1-1/+1
2011-09-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-2/+3
2011-09-24Skip is_array() checkAndrey Andreev1-1/+1
2011-09-24Fix a variable type mismatch (issue #89) in system/database/DB_driver.phpAndrey Andreev1-1/+1
2011-09-24Escape WHERE clause field names in the DB update_string() methodAndrey Andreev1-1/+2
2011-09-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-8/+11
2011-08-30Fixed issue #105 SQL log errorsNiklas Nilsson1-8/+11
Enabled logging database query errors even if $db_debug is not enabled.
2011-08-24Updated version function to use PDO constantTimothy Warren1-1/+1
2011-08-10Added CUBRID Database DriverEsen Sagynov1-1/+1
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones1-17/+17
broke the Typography class's string replacements, for instance
2011-04-25Fixed double-space typo.Razican1-17/+17