summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2012-03-09Adding Support to Properly Escape Objects that have __toString() magic ↵Joel Kallman1-1/+1
method so that the object can be passed directly as a parameter in a condition without having to manually convert to a string Signed-off-by: Joel Kallman <jkallman@eclarian.com>
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-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
2011-10-27Fixed a bug (#200) where MySQL queries would be malformed after calling ↵Greg Aker9-0/+9
db->count_all() then db->get()
2011-10-27Fixed LIKE statement escaping issuesTimothy Warren1-12/+13
2011-10-27Some public and protected method declarationsAndrey Andreev3-59/+59
2011-10-27Remove another 2 old commentsAndrey Andreev1-3/+1
2011-10-27Cleanup and migrate oci8_driver and oci8_result from deprecated PHP4 to PHP5 ↵Andrey Andreev2-118/+120
style functions
2011-10-27Converted database constructors to PHP5 typeTimothy Warren5-7/+7
2011-10-27if statment code style updateTimothy Warren1-0/+792
2011-10-26Misc formatting fixesTimothy Warren1-6/+7
2011-10-26Set charset in DSN if PHP >= 5.3.6Timothy Warren1-0/+6
2011-10-25Changed mysql charset to PDO optionTimothy Warren1-6/+6
2011-10-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-149/+118
2011-10-22Merge pull request #553 from narfbg/ci-oci8-driver-php5Phil Sturgeon3-149/+118
Cleanup and switch oci8_driver and oci8_result to PHP5 functions.
2011-10-21Minor format fixTimothy Warren1-2/+0
2011-10-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren46-186/+738
2011-10-21Fix mysql charset bugTimothy Warren1-4/+22
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones47-190/+754
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-20Some public and protected method declarationsAndrey Andreev3-59/+59
2011-10-20Merge remote-tracking branch 'upstream/develop' into ci-oci8-driver-php5Andrey Andreev6-64/+259
2011-10-14Merged with developmentKyle Farris17-67/+1423
2011-10-10Converted database constructors to PHP5 typeTimothy Warren5-6/+6
2011-10-07Remove another 2 old commentsAndrey Andreev1-2/+0
2011-10-07Cleanup and migrate oci8_driver and oci8_result from deprecated PHP4 to PHP5 ↵Andrey Andreev2-115/+86
style functions
2011-10-07if statment code style updateTimothy Warren1-6/+6
2011-10-07Added check for quote markTimothy Warren1-2/+5
2011-10-07Revert "Added check for quote mark"Timothy Warren1-5/+21
This reverts commit 0e762b32a003dd8a9b805fb95ee7aeb3616c41e3.
2011-10-07Revert "Changed all db constructors to newer syntax, made insert_id() ↵Timothy Warren5-6/+6
function more convenient for postgres on pdo driver" This reverts commit f7a8d86dbc6805a4e52964bbea76738df75b5f35.
2011-10-07Added check for quote markTimothy Warren1-21/+5
2011-10-06Changed all db constructors to newer syntax, made insert_id() function more ↵Timothy Warren6-7/+25
convenient for postgres on pdo driver
2011-10-05Changed to escape using PDO::quote()Timothy Warren1-11/+4
2011-10-04Added batch functions, fixed excaping functionTimothy Warren1-3/+90
2011-10-04Merge pull request #282 from timw4mail/developPhil Sturgeon6-1/+1242
PDO driver for Database class.