Ticket #11488: habtm_uniq_with_find.diff

activerecord/test/cases/associations_test.rb

@@ -1945 +1945 @@
-    projects(:active_record).developers << developers(:david)
-    assert_equal 3, projects(:active_record, :reload).developers.size
-  end
+  
+  def test_uniq_before_the_fact_find
+    projects(:active_record).developers << developers(:jamis)
+    assert_equal 3, projects(:active_record).developers.find(:all).size
+  end
+  
+  def test_uniq_before_the_fact_dynamic_find
+    projects(:active_record).developers << developers(:jamis)
+    assert_equal 2, projects(:active_record).developers.find_all_by_name('Jamis').size
+  end
-
-  def test_deleting
-    david = Developer.find(1)
@@ -2006 +2016 @@
-  def test_additional_columns_from_join_table
-    assert_date_from_db Date.new(2004, 10, 10), Developer.find(1).projects.first.joined_on.to_date
-  end
+  
+  def test_additional_columns_from_join_table_with_dynamic_find
+    assert_date_from_db Date.new(2004, 10, 10), Developer.find(1).projects.find_by_name('Active Record').joined_on.to_date
+  end
-
-  def test_destroy_all
-    david = Developer.find(1)

activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -57 +57 @@
-
-          merge_options_from_reflection!(options)
-
-
+
+
-
-          # Pass through args exactly as we received them.
-          args << options
@@ -137 +138 @@
-                        :joins => @join_sql,
-                        :readonly => false,
-                        :order => @reflection.options[:order],
-
+
+
-        end
+        
+        def construct_select
+          distinct          = 'DISTINCT ' if @reflection.options[:uniq]
+          association_table = @reflection.quoted_table_name
+          join_table        = @owner.connection.quote_table_name(@reflection.options[:join_table])
+          
+          "#{distinct}#{association_table}.*, #{join_table}.*"
+        end
-
-        # Join tables with additional columns on top of the two foreign keys must be considered ambiguous unless a select
-        # clause has been explicitly defined. Otherwise you can get broken records back, if, for example, the join column also has