We shouldn't be using scoped.scoping { ... } to build associated records, as this can affect validations/callbacks/etc inside the record itself [#6252 state:resolved]

1 files changed, 5 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 24fb49a65d..a37c3dd432 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -466,17 +466,14 @@ module ActiveRecord
           force ? record.save! : record.save(:validate => validate)
         end
 
-        def create_record(attrs, &block)
+        def create_record(attributes, &block)
           ensure_owner_is_persisted!
-
-          transaction do
-            scoped.scoping { build_record(attrs, &block) }
-          end
+          transaction { build_record(attributes, &block) }
         end
 
-        def build_record(attrs, &block)
-          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
-          record = @reflection.build_association(attrs)
+        def build_record(attributes, &block)
+          attributes = scoped.scope_for_create.merge(attributes)
+          record = @reflection.build_association(attributes)
           add_record_to_target_with_callbacks(record, &block)
         end