Stop users from calling .create on a has_many / habtm association when the owner is a new_record?

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7511 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 10 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index b0be44ff42..460f410cf0 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -85,6 +85,7 @@ module ActiveRecord
       end
       
       def create(attrs = {})
+        ensure_owner_is_not_new
         record = @reflection.klass.send(:with_scope, :create => construct_scope[:create]) { @reflection.klass.create(attrs) }                
         @target ||= [] unless loaded?
         @target << record 
@@ -92,6 +93,7 @@ module ActiveRecord
       end
 
       def create!(attrs = {})
+        ensure_owner_is_not_new
         record = @reflection.klass.send(:with_scope, :create => construct_scope[:create]) { @reflection.klass.create!(attrs) }                
         @target ||= [] unless loaded?
         @target << record 
@@ -206,7 +208,14 @@ module ActiveRecord
         def callbacks_for(callback_name)
           full_callback_name = "#{callback_name}_for_#{@reflection.name}"
           @owner.class.read_inheritable_attribute(full_callback_name.to_sym) || []
-        end        
+        end   
+        
+        def ensure_owner_is_not_new
+          if @owner.new_record?
+            raise ActiveRecord::RecordNotSaved, "You cannot call create unless the parent is saved"
+          end
+        end
+               
     end
   end
 end