Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2012-03-06 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Jamie Rumbelow | 1 | -235/+172 | |
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php | |||||
2012-03-06 | Move dsn property from the PDO to CI_DB_driver so other DB drivers can use ↵ | Andrey Andreev | 1 | -0/+1 | |
it without declaring it | |||||
2012-03-06 | Just some comment fixes and cleared spaces | Andrey Andreev | 1 | -33/+27 | |
2012-03-06 | Property visibility declarations for CI_DB_driver | Andrey Andreev | 1 | -40/+35 | |
2012-03-06 | Resolve _protect_identifiers()/protect_identifiers() usage issues | Andrey Andreev | 1 | -26/+8 | |
2012-03-06 | Made _protect_identifiers public | Timothy Warren | 1 | -1/+4 | |
2012-03-06 | Made protect_identifiers public | Timothy Warren | 1 | -1/+1 | |
2012-03-06 | Added visibility keywords to DB_driver methods | Timothy Warren | 1 | -70/+38 | |
2012-03-05 | Removed oci8-specific stuff from DB_driver.php and added a constructor to ↵ | Andrey Andreev | 1 | -20/+2 | |
DB_result to handle initialization | |||||
2012-03-04 | Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop | Phil Sturgeon | 1 | -47/+43 | |
2012-03-04 | Merged conflicts. | Phil Sturgeon | 1 | -7/+7 | |
2012-03-03 | Added _optimize_table() support for PostgreSQL | Andrey Andreev | 1 | -1/+1 | |
2012-03-03 | Improve DB version() implementation and add pg_version() support | Andrey Andreev | 1 | -21/+25 | |
2012-03-02 | Merge upstream | Timothy Warren | 1 | -12/+10 | |
2012-03-02 | Replaced DB methods _error_message() and _error_number() with error() (issue ↵ | Andrey Andreev | 1 | -12/+10 | |
#1097) | |||||
2012-03-01 | compile binds before caching the query, otherwise the cached query will ↵ | Ryan Dial | 1 | -6/+6 | |
never match the unbound query. updated changlog to mention bug fix. | |||||
2012-03-01 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird | Timothy Warren | 1 | -6/+5 | |
2012-03-01 | Merge upstream changes | Andrey Andreev | 1 | -8/+19 | |
2012-03-01 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird | Timothy Warren | 1 | -8/+3 | |
2012-03-01 | Fix issue #1036 (is_write_type() returned FALSE for RENAME, OPTIMIZE queries) | Andrey Andreev | 1 | -9/+4 | |
2012-02-29 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird | Timothy Warren | 1 | -0/+16 | |
2012-02-29 | Merged in 2.1-stable changes. | Phil Sturgeon | 1 | -1/+17 | |
2012-02-28 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Jamie Rumbelow | 1 | -24/+10 | |
2012-02-27 | Fixed a db_set_charset() bug | Andrey Andreev | 1 | -6/+5 | |
2012-02-22 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird | Timothy Warren | 1 | -24/+10 | |
2012-02-22 | Fix issue 1070 | Andrey Andreev | 1 | -24/+10 | |
2012-02-19 | Renaming Active Record to Query Builder across the system | Jamie Rumbelow | 1 | -2/+2 | |
2012-02-16 | narfbg suggested fixes | Timothy Warren | 1 | -1/+1 | |
2012-02-09 | Fixed PDO | Taufan Aditya | 1 | -14/+13 | |
2012-01-27 | Improve the MySQLi database driver | Andrey Andreev | 1 | -1/+1 | |
2012-01-02 | Updating copyright date to 2012 | Greg Aker | 1 | -1/+1 | |
2011-12-26 | Merge pull request #709 from tubalmartin/2.1-stable | Phil Sturgeon | 1 | -0/+14 | |
2.1.0 - Fatal error: Call to undefined method CI_DB_Driver::_reset_select() | |||||
2011-12-01 | This fixes issue #725 | Repox | 1 | -2/+8 | |
2011-12-01 | This fixes issue #725 | Repox | 1 | -1/+8 | |
2011-11-29 | The DB_driver can now use failover databases if specified | Felix Balfoort | 1 | -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-24 | Added dummy _reset_select() method to CI_DB_Driver class to allow Active ↵ | Túbal Martín | 1 | -0/+14 | |
Record class to be disabled. Otherwise a fatal error is triggered. | |||||
2011-11-22 | Updated trans_start() and trans_complete() so that _trans_depth increments ↵ | Jacob Terry | 1 | -0/+5 | |
correctly Fix for issue #159 and #163. | |||||
2011-10-27 | Converted database constructors to PHP5 type | Timothy Warren | 1 | -2/+2 | |
2011-10-20 | adding new license file (OSL 3.0) and updating readme to ReST | Derek Jones | 1 | -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-10 | Converted database constructors to PHP5 type | Timothy Warren | 1 | -1/+1 | |
2011-09-28 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Timothy Warren | 1 | -2/+3 | |
2011-09-24 | Skip is_array() check | Andrey Andreev | 1 | -1/+1 | |
2011-09-24 | Fix a variable type mismatch (issue #89) in system/database/DB_driver.php | Andrey Andreev | 1 | -1/+1 | |
2011-09-24 | Escape WHERE clause field names in the DB update_string() method | Andrey Andreev | 1 | -1/+2 | |
2011-09-06 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Timothy Warren | 1 | -8/+11 | |
2011-08-30 | Fixed issue #105 SQL log errors | Niklas Nilsson | 1 | -8/+11 | |
Enabled logging database query errors even if $db_debug is not enabled. | |||||
2011-08-24 | Updated version function to use PDO constant | Timothy Warren | 1 | -1/+1 | |
2011-08-10 | Added CUBRID Database Driver | Esen Sagynov | 1 | -1/+1 | |
2011-07-02 | backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵ | Derek Jones | 1 | -17/+17 | |
broke the Typography class's string replacements, for instance | |||||
2011-04-25 | Fixed double-space typo. | Razican | 1 | -17/+17 | |