Changeset 4123

Timestamp:

04/01/06 20:03:10 (3 years ago)

Author:

david

Message:

Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [DHH] DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [DHH]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/test/associations_test.rb (modified) (3 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [DHH]
+
+* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [DHH]
-
-* Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). [Marcel Mollina Jr.]

trunk/activerecord/lib/active_record/associations.rb

@@ -699 +699 @@
-      # will give the default join table name of "developers_projects" because "D" outranks "P".
-      #
-
-
-
-
-
+
+
+
+
-      #
-      # Adds the following methods for retrieval and query.
@@ -715 +714 @@
-      #   also holds the attributes from <tt>join_attributes</tt> (should be a hash with the column names as keys). This can be used to have additional
-      #   attributes on the join, which will be injected into the associated objects when they are retrieved through the collection.
-
+ This method is now deprecated.
-      # * <tt>collection.delete(object, ...)</tt> - removes one or more objects from the collection by removing their associations from the join table.  
-      #   This does not destroy the objects.

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

@@ -41 +41 @@
-
-          options[:conditions] = conditions
-
-||= !options[:joins].nil?
+     
+  = finding_with_ambigious_select?(options[:select])
-
-          if options[:order] && @reflection.options[:order]
@@ -158 +158 @@
-          @join_sql = "INNER JOIN #{@reflection.options[:join_table]} ON #{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{@reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
-        end
-
+
+
+
+
+
+
+
-    end
-  end

trunk/activerecord/lib/active_record/base.rb

@@ -851 +851 @@
-                    merge = hash[method][key] && params[key] # merge if both scopes have the same key
-                    if key == :conditions && merge
-|sql| "( %s )" % sanitize_sql(sql)
+ |sql| "( %s )" % sanitize_sql(sql) 
-                    elsif key == :include && merge
-                      hash[method][key] = merge_includes(hash[method][key], params[key]).uniq

trunk/activerecord/test/associations_test.rb

@@ -8 +8 @@
-require 'fixtures/customer'
-require 'fixtures/order'
+require 'fixtures/category'
-require 'fixtures/post'
-require 'fixtures/author'
@@ -1081 +1082 @@
-
-class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
-
+categories, :posts, :categories_posts, :
-  
-  def test_has_and_belongs_to_many
@@ -1470 +1471 @@
-    end_sql
-  end
+  
+  def test_updating_attributes_on_non_rich_associations
+    welcome = categories(:technology).posts.first
+    welcome.title = "Something else"
+    assert welcome.save!
+  end
+  
+  def test_updating_attributes_on_rich_associations
+    david = projects(:action_controller).developers.first
+    david.name = "DHH"
+    assert_raises(ActiveRecord::ReadOnlyRecord) { david.save! }
+  end
+
+  
+  def test_updating_attributes_on_rich_associations_with_limited_find
+    david = projects(:action_controller).developers.find(:all, :select => "developers.*").first
+    david.name = "DHH"
+    assert david.save!
+  end
-
-  def test_join_table_alias