aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authormiloops <miloops@gmail.com>2008-11-21 19:20:33 -0300
committerMichael Koziarski <michael@koziarski.com>2008-12-01 20:22:31 +0100
commit97403ad5fdfcdfb2110c6f8fd0ebf43b7afc4859 (patch)
tree77998cf59255d49323d7f7063025ca895e162f62 /activerecord/lib/active_record/associations
parent0c4ba90aa1ea6a8d386c724a55a31e63a13c46ab (diff)
downloadrails-97403ad5fdfcdfb2110c6f8fd0ebf43b7afc4859.tar.gz
rails-97403ad5fdfcdfb2110c6f8fd0ebf43b7afc4859.tar.bz2
rails-97403ad5fdfcdfb2110c6f8fd0ebf43b7afc4859.zip
Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.
Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed]
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/association_proxy.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb
index d1a79df6e6..75ec4fbb2e 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -188,6 +188,7 @@ module ActiveRecord
def merge_options_from_reflection!(options)
options.reverse_merge!(
:group => @reflection.options[:group],
+ :having => @reflection.options[:having],
:limit => @reflection.options[:limit],
:offset => @reflection.options[:offset],
:joins => @reflection.options[:joins],