summaryrefslogtreecommitdiffstats
path: root/system/database/DB_active_rec.php
AgeCommit message (Collapse)AuthorFilesLines
2012-03-14Merge branch 'feature/unit-tests' into developPhil Sturgeon1-0/+1
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-33/+29
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon1-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-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev1-33/+29
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-04Merged develop and fixed conflicts.Phil Sturgeon1-319/+281
2012-02-29Change end() usage due to E_STRICT messagesAndrey Andreev1-1/+2
2012-01-09Fix error undefined variable query on count_all_results db active recordPurwandi1-3/+2
2012-01-08Swap two vars for readabilityAndrey Andreev1-1/+1
2012-01-08Improve database classesAndrey Andreev1-278/+126
2012-01-02Updating copyright date to 2012Greg Aker1-1/+1
2011-12-28added query grouping to Active RecordWanWizard1-72/+186
this is a feature that has been lacking for a very long time. lots of people complained about it over the years, but it never got added so you'd have to resort to handcrafted queries when you needed this feature. This is a port of code from DataMapper, in use since CI 1.6.
2011-12-25Merge branch 'develop' into feature/unit-testsGreg Aker1-5/+9
2011-12-25Fixing soft tabs in a few files.Greg Aker1-1/+1
2011-12-22Adding $escape parameter to the order_by function, this enables ordering by ↵pporlan1-3/+7
custom fields
2011-12-20#798: update changelog and typo fixMancy1-1/+1
2011-12-20taking care of LIKE when used in UPDATE statement #798Mancy1-1/+1
2011-11-27Merge branch 'refs/heads/develop' into feature/unit-testsEric Barnes1-66/+273
Conflicts: user_guide/helpers/number_helper.html
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones1-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-14Merged with developmentKyle Farris1-4/+4
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-07Use NULL as the default value for offset in limit(x, offset) so that default ↵Phil Sturgeon1-2/+2
is not LIMIT 0.
2011-09-02fixes potential SQL injection vector in Active Record offset()kenjis1-1/+1
2011-08-31One more formatting fix.Kyle Farris1-5/+5
2011-08-31Merged changes with development.Kyle Farris1-4/+8
2011-08-31Fixed some items based on code comments by gaker.Kyle Farris1-47/+49
2011-08-26Small formatting fix.kylefarris1-1/+1
2011-08-26Added get_compiled_select(), get_compiled_insert(), get_compiled_update(), ↵Kyle Farris1-34/+223
get_compiled_delete(), and reset_query() methods. to the Active Record class.
2011-08-21Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Phil Sturgeon1-1/+1
feature/unit-tests
2011-08-21Fix for issue #106Dan Montgomery1-1/+1
2011-08-21Merge branch 'develop' into feature/unit-testsGreg Aker1-2/+6
2011-08-21Added ability to _like paramater side to use 'none', in case one wants to ↵Nithin1-2/+6
query like instead of where without case being sensitive
2011-08-20Merge branch 'develop' into feature/unit-testsGreg Aker1-175/+147
Conflicts: .hgignore
2011-08-10Typecast limit and offset in the Database Driver to integers. Fixes ↵Phil Sturgeon1-2/+2
https://bitbucket.org/ellislab/codeigniter-reactor/issue/341/active-record-limit-function-have-sql#comment-597403
2011-08-10Fixed typo in ActiveRecord.Phil Sturgeon1-1/+1
2011-08-10Fixed a bug where using this->db->select_max(), this->db->select_min(), etc ↵Phil Sturgeon1-1/+2
could throw notices. Thanks to w43l for the patch.
2011-07-23Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-07-15... set_dbprefix(). Programatically set the prefix, great for multi-site ↵Phil Sturgeon1-0/+15
systems that "namespace" with prefixes.
2011-07-15Was working on this file so PHP5ified the method visibility scopes. ↵Phil Sturgeon1-154/+106
Pointless, but was adding...
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones1-11/+15
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones1-16/+16
broke the Typography class's string replacements, for instance
2011-05-06Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patchGreg Aker1-11/+15
2011-05-06Fixed a regression where a PHP error could occur when using some methods.Greg Aker1-0/+1
2011-04-25Fixed double-space typo.Razican1-16/+16
2011-04-20Fixed a bug (Core #340) where when passing in the second parameter to ↵Greg Aker1-12/+8
$this->db->select(), column names in subsequent queries would not be properly escaped.
2011-03-22->db->count_all_results() will now return an integer instead of a string.Phil Sturgeon1-2/+2
2011-02-15Better potential fix for escaping MySQL keywords with backticks on ↵Phil Sturgeon1-2/+2
insert/update.
2011-02-14Whitespace cleanup in db classesPascal Kriete1-3/+3
2011-01-05Hey look, it's 2011Greg Aker1-1/+1
2010-11-10Updating PHP requirements in files 5.1.6Greg Aker1-1/+1