Changeset 4265

Timestamp:

04/25/06 05:49:14 (3 years ago)

Author:

rick

Message:

Raise error when trying to add to a has_many :through association. Use the Join Model instead. [Rick]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (2 diffs)
• trunk/activerecord/test/associations_join_model_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Raise error when trying to add to a has_many :through association. [Rick]
+
+    @post.tags << @tag                  # BAD
+    @post.taggings.create(:tag => @tag) # GOOD
-
-* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick]

trunk/activerecord/lib/active_record/associations.rb

@@ -64 +64 @@
-    def message
-      "Can not eagerly load the polymorphic association #{@reflection.name.inspect}"
+    end
+  end
+
+  class ReadOnlyAssociation < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      @reflection = reflection
+    end
+  
+    def message
+      "Can not add to a has_many :through association.  Try adding to #{@reflection.through_reflection.name.inspect}."
-    end
-  end

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

@@ -8 +8 @@
-        construct_sql
-      end
-
-
-      def find(*args)
@@ -40 +39 @@
-        @target = []
-        @loaded = false
+      end
+
+      def <<(*args)
+        raise ActiveRecord::ReadOnlyAssociation, @reflection
+      end
+
+      [:push, :concat, :create, :build].each do |method|
+        alias_method method, :<<
-      end
-

trunk/activerecord/test/associations_join_model_test.rb

@@ -356 +356 @@
-  def test_has_many_through_uses_correct_attributes
-    assert_nil posts(:thinking).tags.find_by_name("General").attributes["tag_id"]
+  end
+
+  def test_raise_error_when_adding_to_has_many_through
+    assert_raise(ActiveRecord::ReadOnlyAssociation) { posts(:thinking).tags <<     tags(:general)  }
+    assert_raise(ActiveRecord::ReadOnlyAssociation) { posts(:thinking).tags.push   tags(:general)  }
+    assert_raise(ActiveRecord::ReadOnlyAssociation) { posts(:thinking).tags.concat tags(:general)  }
+    assert_raise(ActiveRecord::ReadOnlyAssociation) { posts(:thinking).tags.build(:name => 'foo')  }
+    assert_raise(ActiveRecord::ReadOnlyAssociation) { posts(:thinking).tags.create(:name => 'foo') }
-  end
-