summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
AgeCommit message (Collapse)AuthorFilesLines
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-39/+163
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-03-08Just the method, not the propertyJamie Rumbelow1-2/+2
2012-03-06accounting for the rename of protect_identifiersJamie Rumbelow1-22/+22
2012-03-06Updating a couple more references to the AR class in documentation [#1061]Jamie Rumbelow1-20/+20
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-13/+18
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
2012-02-21Fixing an error in #1061Jamie Rumbelow1-25/+25
2012-02-19Renaming Active Record to Query Builder across the systemJamie Rumbelow1-0/+2217