Changeset 8989

Timestamp:

03/07/08 11:45:07 (2 months ago)

Author:

pratik

Message:

Add :readonly option to HasManyThrough associations. Closes #11156 [miloops]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/associations_test.rb (modified) (1 diff)
• trunk/activerecord/test/models/author.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add :readonly option to HasManyThrough associations. #11156 [miloops]
-
-* Improve performance on :include/:conditions/:limit queries by selectively joining in the pre-query.  #9560 [dasil003]

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

@@ -160 +160 @@
-            :limit      => @reflection.options[:limit],
-            :group      => @reflection.options[:group],
+            :readonly   => @reflection.options[:readonly],
-            :include    => @reflection.options[:include] || @reflection.source_reflection.options[:include]
-          )
@@ -254 +255 @@
-                         :select      => construct_select,
-                         :order       => @reflection.options[:order],
-
+
+
+
-        end
-

trunk/activerecord/test/cases/associations_test.rb

@@ -555 +555 @@
-  end
-
+  def test_cant_save_has_many_readonly_association
+    authors(:david).readonly_comments.each { |c| assert_raise(ActiveRecord::ReadOnlyRecord) { c.save! } }
+    authors(:david).readonly_comments.each { |c| assert c.readonly? }
+  end
+
-  def test_triple_equality
-    assert !(Array === Firm.find(:first).clients)

trunk/activerecord/test/models/author.rb

@@ -21 +21 @@
-  has_many :ordered_uniq_comments, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id'
-  has_many :ordered_uniq_comments_desc, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id DESC'
-
+
+
-  has_many :special_posts
-  has_many :special_post_comments, :through => :special_posts, :source => :comments