diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2011-07-08 12:16:32 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2011-07-09 20:14:41 +0900 |
| commit | d1545bcf94af287fca1fc34e0f9c7cfda56ff130 (patch) | |
| tree | bc4c292b99397001ab79bb02a8b744a88f8ad283 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 111968d4024fdccc386979551cdfc7799b39cff0 (diff) | |
| download | rails-d1545bcf94af287fca1fc34e0f9c7cfda56ff130.tar.gz rails-d1545bcf94af287fca1fc34e0f9c7cfda56ff130.tar.bz2 rails-d1545bcf94af287fca1fc34e0f9c7cfda56ff130.zip | |
fix AR having() not to raise NoMethodError when the given argument does not respond to empty?
having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index d17861f407..8bd4732c0c 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -96,11 +96,11 @@ module ActiveRecord relation end - def having(*args) - return self if args.blank? + def having(opts, *rest) + return self if opts.blank? relation = clone - relation.having_values += build_where(*args) + relation.having_values += build_where(opts, rest) relation end |