diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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. |