aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-11-10 16:36:01 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-11-10 16:36:01 +0000
commit3309268120fade0cd643750a4bedf95097cbced6 (patch)
treea014ca1505d05d4e5833e396efec357f2b7b0ad6 /activerecord/lib/active_record/associations
parent3488ff6fc6aa091821088df47ee0ca3ebdd594f0 (diff)
downloadrails-3309268120fade0cd643750a4bedf95097cbced6.tar.gz
rails-3309268120fade0cd643750a4bedf95097cbced6.tar.bz2
rails-3309268120fade0cd643750a4bedf95097cbced6.zip
Add :group option, correspond to GROUP BY, to the find method and to the has_many association. Closes #2818.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/has_many_association.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 3027e26ce0..288742d965 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -113,7 +113,8 @@ module ActiveRecord
:order => @options[:order],
:limit => @options[:limit],
:joins => @options[:joins],
- :include => @options[:include]
+ :include => @options[:include],
+ :group => @options[:group]
)
end
end