diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-08 14:22:10 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-08 14:22:10 -0500 |
| commit | fa987cb8ec4cc48018aac4949567823587155765 (patch) | |
| tree | cc038c5d35b5cab62475dd793b546cd4f8959af5 /activerecord/lib | |
| parent | 01e67316d8c802df3928b53d0e0ce9153044f5ad (diff) | |
| download | rails-fa987cb8ec4cc48018aac4949567823587155765.tar.gz rails-fa987cb8ec4cc48018aac4949567823587155765.tar.bz2 rails-fa987cb8ec4cc48018aac4949567823587155765.zip | |
Reverting 16f6f25 (Change behaviour with empty array in where clause)
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 2099effbeb..d1458f30ba 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -136,7 +136,7 @@ module ActiveRecord 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 diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index db2588e725..24cbae83de 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -17,8 +17,6 @@ module ActiveRecord 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 |