From 521532342452b3024c9cb2e7ebbd7170ee0d42e5 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Tue, 28 Oct 2014 17:03:06 -0600 Subject: Remove unneccessary default values from relation merger The value methods will default to an empty array for us automatically --- activerecord/lib/active_record/relation/merger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index f6bfbe59e2..a8febf6a18 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -108,10 +108,10 @@ module ActiveRecord def merge_multi_values lhs_wheres = relation.where_values - rhs_wheres = other.where_values || [] + rhs_wheres = other.where_values lhs_binds = relation.bind_values - rhs_binds = other.bind_values || [] + rhs_binds = other.bind_values removed, kept = partition_overwrites(lhs_wheres, rhs_wheres) -- cgit v1.2.3