Changeset 9068

Timestamp:

03/21/08 18:21:56 (4 months ago)

Author:

rick

Message:

Allow association scoping for built/created records if :conditions is specified as a hash. Closes #11393 [miloops]

Files:

• trunk/activerecord/lib/active_record/associations.rb (modified) (3 diffs)
• trunk/activerecord/lib/active_record/associations/association_collection.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/associations_test.rb (modified) (2 diffs)
• trunk/activerecord/test/models/category.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/associations.rb

@@ -110 +110 @@
-    # == Auto-generated methods
-    #
-
+ 
-    #                                     |            |  belongs_to  |
-    #   generated methods                 | belongs_to | :polymorphic | has_one
@@ -640 +640 @@
-      #   if the real class name is +SpecialProduct+, you'll have to specify it with this option.
-      # * <tt>:conditions</tt>  - specify the conditions that the associated objects must meet in order to be included as a +WHERE+
-
+
+
+
-      # * <tt>:order</tt>       - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
-      #   such as <tt>last_name, first_name DESC</tt>
@@ -982 +984 @@
-      #   the +has_and_belongs_to_many+ association will use +project_id+ as the default association +foreign_key+.
-      # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a +WHERE+
-
+
+
+
-      # * <tt>:order</tt> - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
-      #   such as <tt>last_name, first_name DESC</tt>

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

@@ -203 +203 @@
-
-        def create_record(attrs)
+          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
-          ensure_owner_is_not_new
-          record = @reflection.klass.send(:with_scope, :create => construct_scope[:create]) { @reflection.klass.new(attrs) }
@@ -213 +214 @@
-
-        def build_record(attrs)
+          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
-          record = @reflection.klass.new(attrs)
-          if block_given?

trunk/activerecord/test/cases/associations_test.rb

@@ -1076 +1076 @@
-  end
-
+  def test_creation_respects_hash_condition
+    ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.build
+    
+    assert        ms_client.save
+    assert_equal  'Microsoft', ms_client.name
+    
+    another_ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.create
+
+    assert        !another_ms_client.new_record?
+    assert_equal  'Microsoft', another_ms_client.name
+  end
+
-  def test_dependent_delete_and_destroy_with_belongs_to
-    author_address = author_addresses(:david_address)
@@ -1888 +1900 @@
-  end
-
+  def test_creation_respects_hash_condition
+    post = categories(:general).post_with_conditions.build(:body => '')
+    
+    assert        post.save
+    assert_equal  'Yet Another Testing Title', post.title
+    
+    another_post = categories(:general).post_with_conditions.create(:body => '')
+
+    assert        !another_post.new_record?
+    assert_equal  'Yet Another Testing Title', another_post.title
+  end
+
-  def test_uniq_after_the_fact
-    developers(:jamis).projects << projects(:active_record)

trunk/activerecord/test/models/category.rb

@@ -10 +10 @@
-                          :select => 'posts.*, 1 as correctness_marker')
-
+  has_and_belongs_to_many :post_with_conditions,
+                          :class_name => 'Post',
+                          :conditions => { :title => 'Yet Another Testing Title' }
-  def self.what_are_you
-    'a category...'