Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add AssociationCollection#create! to be consistent with AssociationCo…

…llection#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
  • Loading branch information...
commit 0ee0c1b2aae3cb90869c79235470e6b69296feeb 1 parent 22f095b
Tobias Lütke authored
View
2  activerecord/CHANGELOG
@@ -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
23 activerecord/lib/active_record/associations/association_collection.rb
@@ -86,14 +86,11 @@ def destroy_all
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 @@ def callbacks_for(callback_name)
@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
3  activerecord/test/connections/native_mysql/connection.rb
@@ -4,6 +4,9 @@
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',
Please sign in to comment.
Something went wrong with that request. Please try again.