Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2012-04-27 | Merge upstream branch | Andrey Andreev | 1 | -2/+2 | |
2012-04-26 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Jamie Rumbelow | 1 | -240/+48 | |
Conflicts: system/core/Loader.php system/database/DB_query_builder.php system/database/drivers/cubrid/cubrid_driver.php system/database/drivers/mssql/mssql_driver.php system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/oci8/oci8_driver.php system/database/drivers/odbc/odbc_driver.php system/database/drivers/pdo/pdo_driver.php system/database/drivers/postgre/postgre_driver.php system/database/drivers/sqlite/sqlite_driver.php user_guide_src/source/changelog.rst user_guide_src/source/database/query_builder.rst | |||||
2012-04-09 | Merge upstream branch | Andrey Andreev | 1 | -30/+0 | |
2012-04-09 | Added a default _delete() method to CI_DB_active_record | Andrey Andreev | 1 | -33/+0 | |
2012-04-06 | Merge upstream branch | Andrey Andreev | 1 | -98/+4 | |
2012-04-06 | Renamed _escape_identifiers() to escape_identifiers() and moved it to ↵ | Andrey Andreev | 1 | -41/+0 | |
CI_DB_driver | |||||
2012-04-05 | Added a default _truncate() method to CI_DB_active_record | Andrey Andreev | 1 | -3/+4 | |
2012-04-05 | Added a default _update() method to CI_DB_active_record | Andrey Andreev | 1 | -35/+0 | |
2012-04-05 | Replaced driver instances of _insert() with one in CI_DB_active_record | Andrey Andreev | 1 | -17/+0 | |
2012-03-28 | Add a dummy db_select() method to CI_DB_driver and remove it from drivers ↵ | Andrey Andreev | 1 | -13/+0 | |
that don't have such functionality | |||||
2012-03-26 | Merge upstream branch | Andrey Andreev | 1 | -15/+0 | |
2012-03-26 | Add ODBC support for the new 'dsn' config value | Andrey Andreev | 1 | -3/+8 | |
2012-03-23 | Add dummy method reconnect() method to CI_DB_driver and remove it from ↵ | Andrey Andreev | 1 | -15/+0 | |
drivers that don't support it | |||||
2012-03-20 | Merge upstream branch | Andrey Andreev | 1 | -16/+1 | |
2012-03-20 | Remove extraneous newlines | Timothy Warren | 1 | -1/+1 | |
2012-03-20 | Remove EOF newlines | Andrey Andreev | 1 | -1/+1 | |
2012-03-20 | Merge upstream | Timothy Warren | 1 | -2/+2 | |
2012-03-20 | Merge upstream branch | Andrey Andreev | 1 | -6/+5 | |
2012-03-20 | Again alter ODBC's escape_str() | Andrey Andreev | 1 | -1/+1 | |
2012-03-20 | Merge upstream | Timothy Warren | 1 | -70/+43 | |
2012-03-20 | Alter str_replace() order in ODBC's escape_str() | Andrey Andreev | 1 | -3/+3 | |
2012-03-20 | Visibility declarations and cleanup for CI_DB_odbc_driver | Andrey Andreev | 1 | -68/+40 | |
2012-03-20 | Revert "ODBC access modifiers" | Timothy Warren | 1 | -37/+59 | |
This reverts commit 142ca8e565b722b758b5ef88c888891d04da8700. | |||||
2012-03-19 | ODBC access modifiers | Timothy Warren | 1 | -59/+37 | |
2012-03-19 | Removed pointless _prep_sql methods | Timothy Warren | 1 | -17/+0 | |
2012-03-09 | Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop | Phil Sturgeon | 1 | -1/+1 | |
2012-03-09 | Bumped CodeIgniter's PHP requirement to 5.2.4. | Phil Sturgeon | 1 | -1/+1 | |
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 | Fix an eventual issue with LIKE escaping | Andrey Andreev | 1 | -3/+2 | |
2012-03-09 | Merge upstream branch | Andrey Andreev | 1 | -2/+1 | |
2012-03-06 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Jamie Rumbelow | 1 | -52/+11 | |
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php | |||||
2012-03-06 | Resolve _protect_identifiers()/protect_identifiers() usage issues | Andrey Andreev | 1 | -1/+1 | |
2012-03-05 | Merge upstream branch | Andrey Andreev | 1 | -2/+2 | |
2012-03-05 | Partially fix issue #306 | Andrey Andreev | 1 | -4/+3 | |
2012-03-05 | Merge upstream branch | Andrey Andreev | 1 | -27/+6 | |
2012-03-03 | Improve DB version() implementation and add pg_version() support | Andrey Andreev | 1 | -13/+0 | |
2012-03-02 | Replaced DB methods _error_message() and _error_number() with error() (issue ↵ | Andrey Andreev | 1 | -17/+6 | |
#1097) | |||||
2012-03-01 | Merge upstream branch | Andrey Andreev | 1 | -15/+0 | |
2012-02-27 | Fixed a db_set_charset() bug | Andrey Andreev | 1 | -17/+1 | |
2012-02-19 | Renaming Active Record to Query Builder across the system | Jamie Rumbelow | 1 | -2/+2 | |
2012-02-13 | Added DSN string support | Andrey Andreev | 1 | -2/+8 | |
2012-01-26 | Improve the ODBC database driver | Andrey Andreev | 1 | -142/+78 | |
2012-01-02 | Updating copyright date to 2012 | Greg Aker | 1 | -1/+1 | |
2011-10-20 | adding new license file (OSL 3.0) and updating readme to ReST | Derek Jones | 1 | -4/+16 | |
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-10 | Converted database constructors to PHP5 type | Timothy Warren | 1 | -2/+2 | |
2011-08-25 | odbc called incorrect parent in construct | Michiel Vugteveen | 1 | -1/+1 | |
2011-08-20 | Fixed a bug (#200) where MySQL queries would be malformed after calling ↵ | Greg Aker | 1 | -0/+1 | |
db->count_all() then db->get() | |||||
2011-07-02 | backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵ | Derek Jones | 1 | -1/+1 | |
broke the Typography class's string replacements, for instance | |||||
2011-04-25 | Fixed double-space typo. | Razican | 1 | -1/+1 | |
2011-02-14 | Whitespace cleanup in db classes | Pascal Kriete | 1 | -2/+2 | |
2011-01-05 | Hey look, it's 2011 | Greg Aker | 1 | -1/+1 | |