github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix AR having() not to raise NoMethodError when the given argument does not respond to empty?

Browse Source 
having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
This commit is contained in:
Akira Matsuda
2011-07-08 12:16:32 +09:00
parent 111968d402
commit d1545bcf94
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/lib/active_record/relation/query_methods.rb
View File

@@ -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

7
activerecord/test/cases/finder_test.rb
View File

@@ -159,6 +159,13 @@ class FinderTest < ActiveRecord::TestCase
assert developers.all? { |developer| developer.salary > 10000 }
end
def test_find_with_group_and_sanitized_having_method
developers = Developer.group(:salary).having("sum(salary) > ?", 10000).select('salary').all
assert_equal 3, developers.size
assert_equal 3, developers.map(&:salary).uniq.size
assert developers.all? { |developer| developer.salary > 10000 }
end
def test_find_with_entire_select_statement
topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'"