github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't pass the block through build_record

Browse Source
This commit is contained in:
Jon Leighton
2011-02-14 00:58:34 +00:00
parent 686418c657
commit 641a3068ea
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
activerecord/lib/active_record/associations/association_collection.rb
View File

@@ -59,21 +59,21 @@ module ActiveRecord
if attributes.is_a?(Array)
attributes.collect { |attr| build(attr, &block) }
else
build_record(attributes) do |record|
block.call(record) if block_given?
add_record_to_target_with_callbacks(build_record(attributes)) do |record|
yield(record) if block_given?
set_owner_attributes(record)
end
end
end
def create(attrs = {})
if attrs.is_a?(Array)
attrs.collect { |attr| create(attr) }
def create(attributes = {})
if attributes.is_a?(Array)
attributes.collect { |attr| create(attr) }
else
ensure_owner_is_persisted!
transaction do
build_record(attrs) do |record|
add_record_to_target_with_callbacks(build_record(attributes)) do |record|
yield(record) if block_given?
insert_record(record)
end
@@ -427,10 +427,8 @@ module ActiveRecord
raise NotImplementedError
end
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)
def build_record(attributes)
@reflection.build_association(scoped.scope_for_create.merge(attributes))
end
def delete_or_destroy(records, method)