2 files changed, 14 insertions, 14 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
 
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index b6f49c6f36..b43b52fc52 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -2,9 +2,7 @@ module ActiveRecord
   module Associations
     class SingularAssociation < AssociationProxy #:nodoc:
       def create(attributes = {})
-        record = scoped.scoping { @reflection.create_association(attributes) }
-        set_new_record(record)
-        record
+        new_record(:create, attributes)
       end
 
       def create!(attributes = {})
@@ -12,9 +10,7 @@ module ActiveRecord
       end
 
       def build(attributes = {})
-        record = scoped.scoping { @reflection.build_association(attributes) }
-        set_new_record(record)
-        record
+        new_record(:build, attributes)
       end
 
       private
@@ -36,6 +32,13 @@ module ActiveRecord
           raise_on_type_mismatch(record) if record
           record
         end
+
+        def new_record(method, attributes)
+          attributes = scoped.scope_for_create.merge(attributes || {})
+          record = @reflection.send("#{method}_association", attributes)
+          set_new_record(record)
+          record
+        end
     end
   end
 end