From b93d2189c4cf370927b9796e0008034a5268214f Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Mon, 14 Feb 2011 00:34:54 +0000 Subject: Get rid of create_record as it is not only used in one place --- .../active_record/associations/association_collection.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 4ead67b282..ff4c2b51ac 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -195,9 +195,13 @@ module ActiveRecord if attrs.is_a?(Array) attrs.collect { |attr| create(attr) } else - create_record(attrs) do |record| - yield(record) if block_given? - insert_record(record) + ensure_owner_is_persisted! + + transaction do + build_record(attrs) do |record| + yield(record) if block_given? + insert_record(record) + end end end end @@ -423,11 +427,6 @@ module ActiveRecord raise NotImplementedError end - def create_record(attributes, &block) - ensure_owner_is_persisted! - transaction { build_record(attributes, &block) } - end - def build_record(attributes, &block) attributes = scoped.scope_for_create.merge(attributes) record = @reflection.build_association(attributes) -- cgit v1.2.3