summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Expand)AuthorFilesLines
2012-03-12Merge upstream branchAndrey Andreev3-37/+9
2012-03-12Remove collation parameter from db_set_charset() (no longer needed)Andrey Andreev3-7/+5
2012-03-12Fix escape_str() and change _prep_query() to just return the queryAndrey Andreev1-4/+3
2012-03-12Add missing semicolonsAndrey Andreev2-2/+2
2012-03-12Remove usage of SET NAMES and the deprecated mysql_escape_string() from MySQL...Andrey Andreev2-30/+4
2012-03-12Fix _limit()Andrey Andreev1-1/+1
2012-03-12Merge upstream branchAndrey Andreev51-54/+77
2012-03-09Adding Support to Properly Escape Objects that have __toString() magic method...Joel Kallman1-1/+1
2012-03-09Allow arrays to be used for enum/set constraint.Phil Sturgeon1-3/+26
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon22-303/+224
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon51-51/+51
2012-03-09_protect_identifiers() to protect_identifier()Andrey Andreev1-2/+2
2012-03-09Merge upstream branchAndrey Andreev25-357/+373
2012-03-09Merge upstream branchAndrey Andreev22-308/+258
2012-03-09Merge upstream branchAndrey Andreev34-764/+1947
2012-03-09Merge upstream branchAndrey Andreev34-770/+1950
2012-03-09Merge upstream branchAndrey Andreev31-677/+1887
2012-03-09Merge upstream branchAndrey Andreev34-754/+1944
2012-03-09Fix an eventual issue with LIKE escapingAndrey Andreev1-3/+2
2012-03-09Merge upstream branchAndrey Andreev24-327/+273
2012-03-09Merge upstream branchAndrey Andreev24-347/+371
2012-03-08missed one :bomb:Jamie Rumbelow1-1/+1
2012-03-08Just the method, not the propertyJamie Rumbelow2-3/+3
2012-03-06accounting for the rename of protect_identifiersJamie Rumbelow2-24/+24
2012-03-06Updating a couple more references to the AR class in documentation [#1061]Jamie Rumbelow2-21/+21
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow34-941/+2021
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driverAndrey Andreev1-2/+1
2012-03-06Move dsn property from the PDO to CI_DB_driver so other DB drivers can use it...Andrey Andreev2-2/+2
2012-03-06Merge upstream branchAndrey Andreev1-3/+5
2012-03-06Revert a comment changeAndrey Andreev1-1/+1
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-06Merge upstream branchAndrey Andreev22-177/+132
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev22-162/+123
2012-03-06Merge pull request #1138 from timw4mail/developAndrey Andreev1-70/+41
2012-03-06Made _protect_identifiers publicTimothy Warren1-1/+4
2012-03-06Made protect_identifiers publicTimothy Warren1-1/+1
2012-03-06Merge upstream branchAndrey Andreev9-63/+152
2012-03-06Added visibility keywords to DB_driver methodsTimothy Warren1-70/+38
2012-03-06Fix issue #1125 ... for realAndrey Andreev1-0/+35
2012-03-05Removed order_by() from PostgreSQL driver too.SammyK1-9/+1
2012-03-05Fixed bug for PostgreSQL driver where setting a limit() on update() or delete...SammyK1-2/+2
2012-03-05Fix issue #64Hamza Bhatti1-1/+1
2012-03-05Rename property _commit to commit_mode and merge upstream changesAndrey Andreev22-411/+1656
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to DB_...Andrey Andreev3-23/+20
2012-03-05Merge upstream branchAndrey Andreev1-2/+2
2012-03-05Partially fix issue #306Andrey Andreev1-4/+3
2012-03-05Merge upstream branchAndrey Andreev23-438/+1677
2012-03-05Fix issue #1125Andrey Andreev1-1/+35
2012-03-04Merged develop and fixed conflicts.Phil Sturgeon52-2187/+2989