From 30a576fa145a8a7d7f68ac295addb24465baf39a Mon Sep 17 00:00:00 2001
From: Damien Mathieu <42@dmathieu.com>
Date: Thu, 5 Jul 2012 13:24:59 +0200
Subject: fix querying with an empty hash

Closes #6960
---
 activerecord/lib/active_record/relation/predicate_builder.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record')

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
-- 
cgit v1.2.3