From e8cdb3d5e73c1be3d551f55602de7f5c34d43c42 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sun, 22 Apr 2012 09:49:56 +0200 Subject: allow merging a single where value --- activerecord/lib/active_record/relation/merger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 1c2a06328f..52cf0b7077 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -85,7 +85,7 @@ module ActiveRecord def merged_wheres if values[:where] - merged_wheres = relation.where_values + values[:where] + merged_wheres = relation.where_values + Array(values[:where]) unless relation.where_values.empty? # Remove duplicates, last one wins. -- cgit v1.2.3