From 6ba0f975d5d2867f80bcf8a809b1337c8f369383 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 7 Dec 2012 00:49:36 -0200 Subject: Ensure there won't be any regression with where(nil) calls Consider this scenario: if params[:foo] conditions = { foo: true } end foos = Foo.where(conditions).order(:id) When params[:foo] is nil, this would call: foos = Foo.where(nil).order(:id) In this scenario, we want Foo.where(conditions) to be the same as calling Foo.all, otherwise we'd get a "NoMethodError order for WhereChain". Related to #8332. --- activerecord/test/cases/associations/has_many_associations_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index e8cc6558ca..d25aca760f 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -299,7 +299,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase end def test_find_with_blank_conditions - [[], {}, ""].each do |blank| + [[], {}, nil, ""].each do |blank| assert_equal 2, Firm.all.merge!(:order => "id").first.clients.where(blank).to_a.size end end -- cgit v1.2.3