aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2010-12-23 17:33:42 +0000
committerJon Leighton <j@jonathanleighton.com>2010-12-26 18:46:58 +0000
commitc6e0433ca3520e9bc999f70840d82a76b9470873 (patch)
tree0dbff799c67fe4f575e332dd2aa2ad21e933d3d9 /activerecord
parent57f5fe1850460e6a45bc075731a5dd78b620fa3e (diff)
downloadrails-c6e0433ca3520e9bc999f70840d82a76b9470873.tar.gz
rails-c6e0433ca3520e9bc999f70840d82a76b9470873.tar.bz2
rails-c6e0433ca3520e9bc999f70840d82a76b9470873.zip
scoped.where_values_hash is never nil
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/association_collection.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 7964f4fa2b..8bb32400cf 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -488,7 +488,7 @@ module ActiveRecord
ensure_owner_is_persisted!
transaction do
- with_scope(:create => @scope[:create].merge(scoped.where_values_hash || {})) do
+ with_scope(:create => @scope[:create].merge(scoped.where_values_hash)) do
build_record(attrs, &block)
end
end