Changeset 7511

Timestamp:

09/18/07 10:26:56 (1 year ago)

Author:

nzkoz

Message:

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

Files:

• trunk/activerecord/lib/active_record/associations/association_collection.rb (modified) (3 diffs)
• trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb (modified) (3 diffs)
• trunk/activerecord/test/associations_test.rb (modified) (2 diffs)
• trunk/activerecord/test/validations_test.rb (modified) (2 diffs)

trunk/activerecord/lib/active_record/associations/association_collection.rb

@@ -86 +86 @@
-      
-      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?
@@ -93 +94 @@
-
-      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?
@@ -207 +209 @@
-          full_callback_name = "#{callback_name}_for_#{@reflection.name}"
-          @owner.class.read_inheritable_attribute(full_callback_name.to_sym) || []
-
+
+
+
+
+
+
+
+
-    end
-  end

trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -16 +16 @@
-      def create(attributes = {})
-        # Can't use Base.create because the foreign key may be a protected attribute.
+        ensure_owner_is_not_new
-        if attributes.is_a?(Array)
-          attributes.collect { |attr| create(attr) }
@@ -23 +24 @@
-          record
-        end
+      end
+      
+      def create!(attributes = {})
+        # Can't use Base.create! because the foreign key may be a protected attribute.
+        ensure_owner_is_not_new
+        if attributes.is_a?(Array)
+          attributes.collect { |attr| create(attr) }
+        else
+          record = build(attributes)
+          insert_record(record, true) unless @owner.new_record?
+          record
+        end        
-      end
-
@@ -76 +89 @@
-        end
-
-
+, force=true
-          if record.new_record?
-
+
+
+
+
+
-          end
-

trunk/activerecord/test/associations_test.rb

@@ -577 +577 @@
-    assert_equal 3, first_firm.plain_clients.size
-  end
+  
+  def test_create_with_bang_on_has_many_when_parent_is_new_raises
+    assert_raises(ActiveRecord::RecordNotSaved) do 
+      firm = Firm.new
+      firm.plain_clients.create! :name=>"Whoever"
+    end
+  end
+
+  def test_regular_create_on_has_many_when_parent_is_new_raises
+    assert_raises(ActiveRecord::RecordNotSaved) do 
+      firm = Firm.new
+      firm.plain_clients.create :name=>"Whoever"
+    end
+  end
+  
+  def test_create_with_bang_on_habtm_when_parent_is_new_raises
+    assert_raises(ActiveRecord::RecordNotSaved) do 
+      Developer.new("name" => "Aredridel").projects.create!    
+    end
+  end
-
-  def test_adding_a_mismatch_class
@@ -1541 +1561 @@
-  def test_create_by_new_record
-    devel = Developer.new(:name => "Marcel", :salary => 75000)
-create
-create
+build
+build
-    assert_equal devel.projects.last, proj2
-    assert proj2.new_record?

trunk/activerecord/test/validations_test.rb

@@ -676 +676 @@
-    assert !t.save
-    assert t.errors.on(:replies)
-t.replies.create
+reply = t.replies.build
-    assert t.valid?
-  end
@@ -881 +881 @@
-      assert !t.save
-      assert t.errors.on(:replies)
-create
+build
-      assert t.valid?
-    end