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
This commit is contained in:
Tobias Lütke 2006-12-05 17:55:44 +00:00
parent 22f095be23
commit 0ee0c1b2aa
3 changed files with 20 additions and 8 deletions

View File

@ -1,5 +1,7 @@
*SVN*
* Add AssociationCollection#create! to be consistent with AssociationCollection#create when dealing with a foreign key that is a protected attribute [Cody Fauser]
* Added counter optimization for AssociationCollection#any? so person.friends.any? won't actually load the full association if we have the count in a cheaper form [DHH]
* Subclasses of an abstract class work with single-table inheritance. #5704 [nick+rails@ag.arizona.edu, Ryan Davis, Jeremy Kemper]

View File

@ -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

View File

@ -4,6 +4,9 @@ require 'logger'
ActiveRecord::Base.logger = Logger.new("debug.log")
# GRANT ALL PRIVILEGES ON activerecord_unittest.* to 'rails'@'localhost';
# GRANT ALL PRIVILEGES ON activerecord_unittest2.* to 'rails'@'localhost';
ActiveRecord::Base.configurations = {
'arunit' => {
:adapter => 'mysql',