summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
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-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.
2011-10-04Issue 352: Since the MySQL client API version matters, PHP and MySQL version ↵RH Becker2-31/+9
checks are not sufficient to determine that set_charset functions exist.
2011-10-03Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-1/+1
2011-09-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-2/+3
2011-09-28Fixing issue 465: select_max is adding prefix to table aliases when is not ↵Juan José González1-1/+1
necessary
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-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren2-11/+42
2011-09-23Merge pull request #469 from narfbg/ci-issue-182Greg Aker1-7/+10
Fix issue #182: OCI8's num_rows() re-executing the statement