Permalink
Browse files

Reverting 16f6f25 (Change behaviour with empty array in where clause)

  • Loading branch information...
guilleiguaran committed Feb 8, 2013
1 parent 01e6731 commit fa987cb8ec4cc48018aac4949567823587155765
@@ -1,10 +1,5 @@
## Rails 4.0.0 (unreleased) ##
-* Raise `ArgumentError` instead of generating `column IN (NULL)` SQL when
- empty array is used in where clause value.
-
- *Roberto Miranda*
-
* Raise `ArgumentError` instead of generating invalid SQL when empty hash is
used in where clause value.
@@ -136,7 +136,7 @@ def delete_records(records, method)
records = load_target if records == :all
scope = through_association.scope
- scope.where! construct_join_attributes(*records) unless records.empty?
+ scope.where! construct_join_attributes(*records)
case method
when :destroy
@@ -17,8 +17,6 @@ def self.build_from_hash(klass, attributes, default_table)
queries.concat expand(association && association.klass, table, k, v)
end
end
- elsif value.is_a?(Array) && value.empty?
- raise ArgumentError, "Condition value in SQL clause can't be an empty array"
else
column = column.to_s
@@ -808,6 +808,15 @@ def test_find_with_nil_inside_set_passed_for_one_attribute
assert_equal [2, 1].sort, client_of.compact.sort
end
+ def test_find_with_nil_inside_set_passed_for_attribute
+ client_of = Company.all.merge!(
+ :where => { :client_of => [nil] },
+ :order => 'client_of DESC'
+ ).map { |x| x.client_of }
+
+ assert_equal [], client_of.compact
+ end
+
def test_with_limiting_with_custom_select
posts = Post.references(:authors).merge(
:includes => :author, :select => ' posts.*, authors.id as "author_id"',
@@ -98,9 +98,7 @@ def test_where_with_table_name_and_empty_hash
end
def test_where_with_table_name_and_empty_array
- assert_raises(ArgumentError) do
- Post.where(:id => [])
- end
+ assert_equal 0, Post.where(:id => []).count
end
def test_where_with_empty_hash_and_no_foreign_key
@@ -515,9 +515,8 @@ def test_find_ids
end
def test_find_in_empty_array
- assert_raises(ArgumentError) do
- Author.all.where(:id => [])
- end
+ authors = Author.all.where(:id => [])
+ assert authors.to_a.blank?
end
def test_where_with_ar_object

2 comments on commit fa987cb

Contributor

lexmag replied Feb 8, 2013

Should be e170014 reverted?

Contributor

mdespuits replied Feb 8, 2013

👍 Thank you!

Please sign in to comment.