Ticket #11393: associations_respects_hash_conditions.diff

test/models/category.rb

@@ -9 +9 @@
-                          :association_foreign_key => 'post_id',
-                          :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...'
-  end

test/cases/associations_test.rb

@@ -1014 +1014 @@
-    assert_equal 1, Client.find_all_by_client_of(firm.id).size
-  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)
-    assert_equal [], AuthorAddress.destroyed_author_address_ids[authors(:david).id]
@@ -1826 +1838 @@
-    assert_equal Developer.find_by_name("Marcel").projects.last, proj2  # prove join table is updated
-  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)
-    developers(:jamis).projects << projects(:active_record)

lib/active_record/associations/association_collection.rb

@@ -202 +202 @@
-      private
-
-        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) }
-          if block_given?
@@ -212 +213 @@
-        end
-
-        def build_record(attrs)
+          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
-          record = @reflection.klass.new(attrs)
-          if block_given?
-            add_record_to_target_with_callbacks(record) { |*block_args| yield(*block_args) }