aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-09-28 15:56:08 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-09-28 15:56:08 -0700
commitc2cad2d97e5feb872ac9222d8f4e393201f4ad18 (patch)
treef9a286de24b6c313d8ccc617c8fa7e8e76b1ad03 /activerecord
parent3f16103daf330a067454dd2ae324d8d238ac5ba3 (diff)
downloadrails-c2cad2d97e5feb872ac9222d8f4e393201f4ad18.tar.gz
rails-c2cad2d97e5feb872ac9222d8f4e393201f4ad18.tar.bz2
rails-c2cad2d97e5feb872ac9222d8f4e393201f4ad18.zip
where_values_hash always returns a hash
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 062293eea4..04ba5b291e 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -327,7 +327,7 @@ module ActiveRecord
def scope_for_create
@scope_for_create ||= begin
if @create_with_value
- @create_with_value.reverse_merge(where_values_hash || {})
+ @create_with_value.reverse_merge(where_values_hash)
else
where_values_hash
end