Changeset 8864

Timestamp:

02/13/08 06:32:50 (3 months ago)

Author:

bitsweat

Message:

Introduce the :readonly option to all associations. Records from the association cannot be saved. Closes #11084.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (12 diffs)
• trunk/activerecord/lib/active_record/associations/association_proxy.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/belongs_to_association.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_one_association.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations_test.rb (modified) (4 diffs)
• trunk/activerecord/test/cases/reflection_test.rb (modified) (1 diff)
• trunk/activerecord/test/models/company.rb (modified) (2 diffs)
• trunk/activerecord/test/models/project.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Introduce the :readonly option to all associations. Records from the association cannot be saved.  #11084 [miloops]
-
-* Multiparameter attributes for time columns fail over to DateTime when out of range of Time [Geoff Buesing]

trunk/activerecord/lib/active_record/associations.rb

@@ -670 +670 @@
-      #   association is a polymorphic +belongs_to+.
-      # * <tt>:uniq</tt> - if set to +true+, duplicates will be omitted from the collection. Useful in conjunction with <tt>:through</tt>.
+      # * <tt>:readonly</tt> - if set to +true+, all the associated objects are readonly through the association.
-      #
-      # Option examples:
@@ -678 +679 @@
-      #   has_many :comments, :dependent => :nullify
-      #   has_many :tags, :as => :taggable
+      #   has_many :reports, :readonly => true
-      #   has_many :subscribers, :through => :subscriptions, :source => :user
-      #   has_many :subscribers, :class_name => "Person", :finder_sql =>
@@ -736 +738 @@
-      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when this object is loaded.
-      # * <tt>:as</tt>: Specifies a polymorphic interface (See <tt>#belongs_to</tt>).
-
+
+
-      # Option examples:
-      #   has_one :credit_card, :dependent => :destroy  # destroys the associated credit card
@@ -743 +746 @@
-      #   has_one :project_manager, :class_name => "Person", :conditions => "role = 'project_manager'"
-      #   has_one :attachment, :as => :attachable
+      #   has_one :boss, :readonly => :true
-      def has_one(association_id, options = {})
-        reflection = create_has_one_reflection(association_id, options)
@@ -812 +816 @@
-      #   Note: If you've enabled the counter cache, then you may want to add the counter cache attribute
-      #   to the attr_readonly list in the associated classes (e.g. class Post; attr_readonly :comments_count; end).
+      # * <tt>:readonly</tt> - if set to +true+, the associated object is readonly through the association.
-      #
-      # Option examples:
@@ -819 +824 @@
-      #              :conditions => 'discounts > #{payments_count}'
-      #   belongs_to :attachable, :polymorphic => true
+      #   belongs_to :project, :readonly => true
-      def belongs_to(association_id, options = {})
-        reflection = create_belongs_to_reflection(association_id, options)
@@ -971 +977 @@
-      # * <tt>:select</tt>: By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if, for example, you want to do a join
-      #   but not include the joined columns.
+      # * <tt>:readonly</tt> - if set to +true+, all the associated objects are readonly through the association.
-      #
-      # Option examples:
@@ -977 +984 @@
-      #   has_and_belongs_to_many :nations, :class_name => "Country"
-      #   has_and_belongs_to_many :categories, :join_table => "prods_cats"
+      #   has_and_belongs_to_many :categories, :readonly => true
-      #   has_and_belongs_to_many :active_projects, :join_table => 'developers_projects', :delete_sql =>
-      #   'DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}'
@@ -1235 +1243 @@
-            :finder_sql, :counter_sql,
-            :before_add, :after_add, :before_remove, :after_remove,
-
+, :readonly
-          )
-
@@ -1245 +1253 @@
-        def create_has_one_reflection(association_id, options)
-          options.assert_valid_keys(
-
+, :readonly
-          )
-
@@ -1254 +1262 @@
-          options.assert_valid_keys(
-            :class_name, :foreign_key, :foreign_type, :remote, :conditions, :order, :include, :dependent,
-
+, :readonly
-          )
-
@@ -1273 +1281 @@
-            :finder_sql, :delete_sql, :insert_sql,
-            :before_add, :after_add, :before_remove, :after_remove,
-
+, :readonly
-          )
-

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

@@ -115 +115 @@
-            :joins   => @reflection.options[:joins],
-            :include => @reflection.options[:include],
-
+
+
-          )
-        end

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

@@ -45 +45 @@
-            @owner[@reflection.primary_key_name], 
-            :conditions => conditions,
-
+
+
-          )
-        end

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

@@ -54 +54 @@
-            :conditions => @finder_sql, 
-            :order      => @reflection.options[:order], 
-
+
+
-          )
-        end

trunk/activerecord/test/cases/associations_test.rb

@@ -470 +470 @@
-  end
-
+  def test_cant_save_readonly_association
+    assert_raise(ActiveRecord::ReadOnlyRecord) { companies(:first_firm).readonly_account.save!  }
+    assert companies(:first_firm).readonly_account.readonly?
+  end
+
-end
-
@@ -543 +548 @@
-    assert_equal 2, companies(:first_firm).limited_clients.find(:all, :conditions => "type = 'Client'", :limit => 9_000).length
-    assert_equal 2, companies(:first_firm).limited_clients.find_all_by_type('Client', :limit => 9_000).length
+  end
+
+  def test_dynamic_find_all_should_respect_readonly_access
+    companies(:first_firm).readonly_clients.find(:all).each { |c| assert_raise(ActiveRecord::ReadOnlyRecord) { c.save!  } }
+    companies(:first_firm).readonly_clients.find(:all).each { |c| assert c.readonly? }
-  end
-
@@ -1580 +1590 @@
-    # the author id of the post should be the id we set
-    assert_equal post.author_id, author2.id
+  end
+
+  def test_cant_save_readonly_association
+    assert_raise(ActiveRecord::ReadOnlyRecord) { companies(:first_client).readonly_firm.save! }
+    assert companies(:first_client).readonly_firm.readonly?
-  end
-
@@ -1988 +2003 @@
-  end
-
+  def test_dynamic_find_all_should_respect_readonly_access
+    projects(:active_record).readonly_developers.each { |d| assert_raise(ActiveRecord::ReadOnlyRecord) { d.save!  } if d.valid?}
+    projects(:active_record).readonly_developers.each { |d| d.readonly? }
+  end
+
-  def test_new_with_values_in_collection
-    jamis = DeveloperForProjectWithAfterCreateHook.find_by_name('Jamis')

trunk/activerecord/test/cases/reflection_test.rb

@@ -160 +160 @@
-
-  def test_reflection_of_all_associations
-7
-5
-2
+9
+6
+3
-    assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
-  end

trunk/activerecord/test/models/company.rb

@@ -41 +41 @@
-  has_many :clients_using_finder_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE 1=1'
-  has_many :plain_clients, :class_name => 'Client'
+  has_many :readonly_clients, :class_name => 'Client', :readonly => true
-
-  has_one :account, :foreign_key => "firm_id", :dependent => :destroy
+  has_one :readonly_account, :foreign_key => "firm_id", :class_name => "Account", :readonly => true
-end
-
@@ -61 +63 @@
-  belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
-  belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => ["1 = ?", 1]
+  belongs_to :readonly_firm, :class_name => "Firm", :foreign_key => "firm_id", :readonly => true
-
-  # Record destruction so we can test whether firm.clients.clear has

trunk/activerecord/test/models/project.rb

@@ -1 +1 @@
-class Project < ActiveRecord::Base
-  has_and_belongs_to_many :developers, :uniq => true, :order => 'developers.name desc, developers.id desc'
+  has_and_belongs_to_many :readonly_developers, :class_name => "Developer", :readonly => true
-  has_and_belongs_to_many :selected_developers, :class_name => "Developer", :select => "developers.*", :uniq => true
-  has_and_belongs_to_many :non_unique_developers, :order => 'developers.name desc, developers.id desc', :class_name => 'Developer'