diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2014-10-28 17:03:06 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2014-10-28 17:03:06 -0600 |
| commit | 521532342452b3024c9cb2e7ebbd7170ee0d42e5 (patch) | |
| tree | a1e0283a9dcac365cd2f485e8d9e90853411084b /activerecord | |
| parent | 4c248a0280f695c87757eacc8f30506cb6c1e90a (diff) | |
| download | rails-521532342452b3024c9cb2e7ebbd7170ee0d42e5.tar.gz rails-521532342452b3024c9cb2e7ebbd7170ee0d42e5.tar.bz2 rails-521532342452b3024c9cb2e7ebbd7170ee0d42e5.zip | |
Remove unneccessary default values from relation merger
The value methods will default to an empty array for us automatically
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 4 |
1 files 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) |