summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2012-01-26DB forge escaping relatedAndrey Andreev2-9/+9
2012-01-24Revert a space in the license agreement :)Andrey Andreev4-4/+4
2012-01-20Replaced AND with &&Andrey Andreev3-31/+25
2012-01-19Some more cleaningAndrey Andreev2-16/+4
2012-01-16Removed some unneeded code and fixed a possible bugAndrey Andreev1-67/+10
2012-01-16Additional clean-upAndrey Andreev4-226/+123
2012-01-10Merge upstream branchAndrey Andreev1-3/+2
2012-01-09Fix error undefined variable query on count_all_results db active recordPurwandi1-3/+2
2012-01-08Merge remote-tracking branch 'upstream/develop' into develop-db-oci8Andrey Andreev6-573/+270
2012-01-08Swap two vars for readabilityAndrey Andreev1-1/+1
2012-01-08Improve database classesAndrey Andreev6-573/+270
2012-01-07Merge upstream branchAndrey Andreev1-2/+2
2012-01-05Merge pull request #839 from GDmac/developGreg Aker1-2/+2
No need for eval to extend a class
2012-01-05Really fix error handling :)Andrey Andreev1-1/+1
2012-01-05Fix issue 413Andrey Andreev1-4/+25
2012-01-05Fix a method descriptionAndrey Andreev1-1/+1
2012-01-05Numerous improvements to the Oracle (oci8) driver and DB_driverAndrey Andreev5-288/+741
2012-01-02Updating copyright date to 2012Greg Aker47-47/+47
2011-12-31Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-72/+186
2011-12-31Added method chaining to DBForge.Phil Sturgeon1-28/+21
2011-12-28added query grouping to Active RecordWanWizard1-72/+186
this is a feature that has been lacking for a very long time. lots of people complained about it over the years, but it never got added so you'd have to resort to handcrafted queries when you needed this feature. This is a port of code from DataMapper, in use since CI 1.6.
2011-12-28Adding docblock to _process_fields() in the postgres dbforge file.Greg Aker1-0/+3
2011-12-28Fix #808 Postgresql DBForge Driver errors.Greg Aker1-55/+51
- _process_fields() was missing and add_column(), drop_column() was producing malformed queries.
2011-12-26No need for eval to extend a classGDmac1-2/+2
2011-12-25Merge branch 'patch-4' of https://github.com/kylefarris/CodeIgniter into ↵Greg Aker1-1/+1
kylefarris-patch-4 Conflicts: user_guide_src/source/changelog.rst
2011-12-25Fixing soft tabs in a few files.Greg Aker3-9/+5
2011-12-25Merge pull request #792 from a-krebs/patch-1Greg Aker1-2/+2
fix to issue #696
2011-12-22Adding $escape parameter to the order_by function, this enables ordering by ↵pporlan1-3/+7
custom fields
2011-12-20#798: update changelog and typo fixMancy1-1/+1
2011-12-20#798: following current codeigniter code standardsMancy1-5/+6
2011-12-20taking care of LIKE when used in UPDATE statement #798Mancy2-2/+11
2011-12-08Exception for sqlitetoopay1-1/+4
2011-12-05changed _create_table to return true if table already existsTomasz T1-1/+2
2011-12-05changed create_table method to check whether a value returned from driver's ↵Tomasz T1-0/+6
forge is sql or bool (acts exactly as create_database)
2011-12-02SELECT * FROM isn't that innocuous, changed to SELECT 1Tomasz T1-1/+1
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-28Fixed sytax error in pdo driverTimothy Warren1-4/+0
2011-11-23Merge pull request #691 from jerkob/developPhil Sturgeon1-0/+5
Updated trans_start() and trans_complete() so _trans_depth increments.
2011-11-23fix to issue #696 - make oci_execute calls inside num_rows non-committing, ↵a-krebs1-2/+2
since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
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-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon3-6/+10
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-10-31Misc formatting fixesTimothy Warren1-7/+8
2011-10-31Set charset in DSN if PHP >= 5.3.6Timothy Warren1-1/+7
2011-10-31Changed mysql charset to PDO optionTimothy Warren1-4/+7
2011-10-27Fixed issue #150 correctly.Phil Sturgeon2-6/+6
2011-10-27Fixed issue #150 (for mysql and mysqli), now returns the actual column length.danmontgomery4-15/+25