summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2012-03-16Spacing and replace array_key_existsTaufan Aditya1-2/+2
2012-03-14Merged unit test progress.Phil Sturgeon3-38/+10
2012-03-14Merge branch 'feature/unit-tests' into developPhil Sturgeon1-0/+1
2012-03-13Swtich _bind_params() from private to protectedAndrey Andreev1-1/+1
2012-03-13Merge upstream branchAndrey Andreev51-92/+87
2012-03-12Merge branch 'develop' into feature/db_toString_supportJoel Kallman52-2571/+3356
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 ↵Andrey Andreev2-30/+4
MySQL/MySQLi drivers
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 ↵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>
2012-03-09Allow arrays to be used for enum/set constraint.Phil Sturgeon1-3/+26
This was working in MySQL but not MySQLi.
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
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
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-754/+1944
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
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
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 ↵Andrey Andreev2-2/+2
it without declaring it
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
Added visibility keywords to DB_driver methods
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 ↵SammyK1-2/+2
delete() would throw a syntax error from Postgres.
2012-03-05Fix issue #64Hamza Bhatti1-1/+1
Modify regular expression to be able to handle SQL bracket delimiters for column names that contain special characters or SQL keywords. Signed-off-by: Hamza Bhatti <tiyowan@gmail.com>
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 ↵Andrey Andreev3-23/+20
DB_result to handle initialization
2012-03-05Partially fix issue #306Andrey Andreev1-4/+3
2012-03-05Fix issue #1125Andrey Andreev1-1/+35
2012-03-04Merged develop and fixed conflicts.Phil Sturgeon52-2187/+2989
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon24-623/+1701
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-24 17:32:26 +0100