aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorTobias Lütke <tobias.luetke@gmail.com>2006-12-05 17:55:44 +0000
committerTobias Lütke <tobias.luetke@gmail.com>2006-12-05 17:55:44 +0000
commit0ee0c1b2aae3cb90869c79235470e6b69296feeb (patch)
treec6f5d8545dd6b49d9e8e8671dee6f602ebf1dba4 /activerecord/lib/active_record
parent22f095be233e6cfc9bd21104f271d354451bcdcb (diff)
downloadrails-0ee0c1b2aae3cb90869c79235470e6b69296feeb.tar.gz
rails-0ee0c1b2aae3cb90869c79235470e6b69296feeb.tar.bz2
rails-0ee0c1b2aae3cb90869c79235470e6b69296feeb.zip
Add AssociationCollection#create! to be consistent with AssociationCollection#create when dealing with a foreign key that is a protected attribute
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/association_collection.rb23
1 files changed, 15 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 273cc64334..b8337fe4d9 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -86,14 +86,11 @@ module ActiveRecord
end
def create(attributes = {})
- # Can't use Base.create since the foreign key may be a protected attribute.
- if attributes.is_a?(Array)
- attributes.collect { |attr| create(attr) }
- else
- record = build(attributes)
- record.save unless @owner.new_record?
- record
- end
+ build_and_save_with(attributes, :save)
+ end
+
+ def create!(attributes = {})
+ build_and_save_with(attributes, :save!)
end
# Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and
@@ -202,6 +199,16 @@ module ActiveRecord
@owner.class.read_inheritable_attribute(full_callback_name.to_sym) || []
end
+ def build_and_save_with(attributes, method)
+ # Can't use Base.create since the foreign key may be a protected attribute.
+ if attributes.is_a?(Array)
+ attributes.collect { |attr| create(attr) }
+ else
+ record = build(attributes)
+ record.send(method) unless @owner.new_record?
+ record
+ end
+ end
end
end
end