diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-09-03 21:30:22 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-09-03 21:30:22 +0200 |
| commit | 93acbf6bf31ca1802d7631c57da693a824456c4a (patch) | |
| tree | 0c2be6d2c127abf50572dc86bf7dc182c00bb49c /activerecord/lib/active_record/relation/calculations.rb | |
| parent | d28438caf2342be3df8421ed92b95e0510be8ac0 (diff) | |
| parent | f8fb4651a7d8218befce48d66f4fadcea6ece37a (diff) | |
| download | rails-93acbf6bf31ca1802d7631c57da693a824456c4a.tar.gz rails-93acbf6bf31ca1802d7631c57da693a824456c4a.tar.bz2 rails-93acbf6bf31ca1802d7631c57da693a824456c4a.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activerecord/lib/active_record/relation/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index ab78067106..ea364a3b30 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -14,9 +14,9 @@ module ActiveRecord # # * <tt>:conditions</tt>: An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. # See conditions in the intro to ActiveRecord::Base. - # * <tt>:joins</tt>: Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" + # * <tt>:joins</tt>: Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" # (rarely needed) or named associations in the same form used for the <tt>:include</tt> option, which will - # perform an INNER JOIN on the associated table(s). If the value is a string, then the records + # perform an INNER JOIN on the associated table(s). If the value is a string, then the records # will be returned read-only since they will have attributes that do not correspond to the table's columns. # Pass <tt>:readonly => false</tt> to override. # * <tt>:include</tt>: Named associations that should be loaded alongside using LEFT OUTER JOINs. |