diff options
| author | Damien Mathieu <42@dmathieu.com> | 2012-07-05 13:24:59 +0200 |
|---|---|---|
| committer | Damien Mathieu <42@dmathieu.com> | 2012-09-19 15:57:22 +0200 |
| commit | 30a576fa145a8a7d7f68ac295addb24465baf39a (patch) | |
| tree | b482e9f057996bcd5b7e7b29f921486d97d5c39b /activerecord/lib/active_record | |
| parent | f4ad0ebe7a6b17658bddfeb996e3c34835b75623 (diff) | |
| download | rails-30a576fa145a8a7d7f68ac295addb24465baf39a.tar.gz rails-30a576fa145a8a7d7f68ac295addb24465baf39a.tar.bz2 rails-30a576fa145a8a7d7f68ac295addb24465baf39a.zip | |
fix querying with an empty hash
Closes #6960
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index 36fc08e6ad..263fdce250 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -10,8 +10,12 @@ module ActiveRecord table = Arel::Table.new(column, default_table.engine) association = klass.reflect_on_association(column.to_sym) - value.each do |k, v| - queries.concat expand(association && association.klass, table, k, v) + if value.empty? + queries.concat ['1 = 2'] + else + value.each do |k, v| + queries.concat expand(association && association.klass, table, k, v) + end end else column = column.to_s |