Ticket #7143: golden.diff

activerecord/test/associations/join_model_test.rb

@@ -298 +298 @@
-      assert_equal [posts(:welcome), posts(:thinking)], tags(:general).taggings.find(:all, :include => :taggable)
-    end
-  end
+  
+  def test_has_many_polymorphic_with_source_type
+    assert_equal [posts(:welcome), posts(:thinking)], tags(:general).tagged_posts
+  end
-
+  def test_eager_has_many_polymorphic_with_source_type
+    tag_with_include = Tag.find(tags(:general).id, :include => :tagged_posts)
+    desired = [posts(:welcome), posts(:thinking)]
+    assert_no_queries do
+      assert_equal desired, tag_with_include.tagged_posts
+    end
+  end
+
-  def test_has_many_through_has_many_find_all
-    assert_equal comments(:greetings), authors(:david).comments.find(:all, :order => 'comments.id').first
-  end

activerecord/test/fixtures/tag.rb

@@ -2 +2 @@
-  has_many :taggings
-  has_many :taggables, :through => :taggings
-  has_one  :tagging
+
+  has_many :tagged_posts, :through => :taggings, :source => :taggable, :source_type => 'Post'
-end

activerecord/lib/active_record/reflection.rb

@@ -178 +178 @@
-          if source_reflection.nil?
-            raise HasManyThroughSourceAssociationNotFoundError.new(self)
-          end
+
+          if options[:source_type] && source_reflection.options[:polymorphic].nil?
+            raise HasManyThroughAssociationPointlessSourceTypeError.new(active_record.name, self, source_reflection)
+          end
-          
-
+ && options[:source_type].nil?
-            raise HasManyThroughAssociationPolymorphicError.new(active_record.name, self, source_reflection)
-          end
-          
@@ -193 +197 @@
-        def derive_class_name
-          # get the class_name of the belongs_to association of the through reflection
-          if through_reflection
-
+options[:source_type] || 
-          else
-            class_name = name.to_s.camelize
-            class_name = class_name.singularize if [ :has_many, :has_and_belongs_to_many ].include?(macro)

activerecord/lib/active_record/associations/has_many_through_association.rb

@@ -138 +138 @@
-
-        # Construct attributes for :through pointing to owner and associate.
-        def construct_join_attributes(associate)
-
+
+
+
+
+
-        end
-
-        # Associate attributes pointing to owner, quoted.
@@ -176 +180 @@
-          if @reflection.through_reflection.options[:as] || @reflection.source_reflection.macro == :belongs_to
-            reflection_primary_key = @reflection.klass.primary_key
-            source_primary_key     = @reflection.source_reflection.primary_key_name
+            if @reflection.options[:source_type]
+              polymorphic_join = "AND %s.%s = %s" % [
+                @reflection.through_reflection.table_name, "#{@reflection.source_reflection.options[:foreign_type]}",
+                @owner.class.quote_value(@reflection.options[:source_type])
+              ]
+            end
-          else
-            reflection_primary_key = @reflection.source_reflection.primary_key_name
-            source_primary_key     = @reflection.klass.primary_key

activerecord/lib/active_record/associations.rb

@@ -20 +20 @@
-      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' on the polymorphic object '#{source_reflection.class_name}##{source_reflection.name}'.")
-    end
-  end
-
+
+
+
+
+
+
+
-  class HasManyThroughSourceAssociationNotFoundError < ActiveRecordError #:nodoc:
-    def initialize(reflection)
-      through_reflection      = reflection.through_reflection
@@ -593 +599 @@
-      # * <tt>:source</tt>: Specifies the source association name used by <tt>has_many :through</tt> queries.  Only use it if the name cannot be 
-      #   inferred from the association.  <tt>has_many :subscribers, :through => :subscriptions</tt> will look for either +:subscribers+ or
-      #   +:subscriber+ on +Subscription+, unless a +:source+ is given.
+      # * <tt>:source_type</tt>: Specifies type of the source association used by <tt>has_many :through</tt> queries where the source association
+      #   is a polymorphic belongs_to.
-      # * <tt>:uniq</tt> - if set to true, duplicates will be omitted from the collection. Useful in conjunction with :through.
-      #
-      # Option examples:
@@ -1151 +1159 @@
-            :class_name, :table_name, :foreign_key,
-            :exclusively_dependent, :dependent,
-            :select, :conditions, :include, :order, :group, :limit, :offset,
-
+ :source_type,
-            :uniq,
-            :finder_sql, :counter_sql, 
-            :before_add, :after_add, :before_remove, :after_remove, 
@@ -1555 +1563 @@
-                  case
-                    when reflection.macro == :has_many && reflection.options[:through]
-                      through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : ''
+
+                      jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil
+                      first_key = second_key = as_extra = nil
+                      
-                      if through_reflection.options[:as] # has_many :through against a polymorphic join
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        ]
-                      else
-if source_reflection.macro == :has_many && source_reflection.options[:as]
-    " LEFT OUTER JOIN %s ON %s.%s = %s.%s "  % [
-      table_alias_for(through_reflection.klass.table_name, aliased_join_table_name), aliased_join_table_name,
-      through_reflection.primary_key_name,
-      parent.aliased_table_name, parent.primary_key] +
-  " LEFT OUTER JOIN %s ON %s.%s = %s.%s AND %s.%s = %s " % [
-  table_name_and_alias,
-  aliased_table_name, "#{source_reflection.options[:as]}_id", 
-  aliased_join_table_name, options[:foreign_key] || primary_key,
-"#{source_reflection.options[:as]}_type"
+jt_foreign_key = through_reflection.primary_key_name
+end
+
+case source_reflection.macro
+when :has_many
+if source_reflection.options[:as]
+first_key   = "#{source_reflection.options[:as]}_id"
+second_key  = options[:foreign_key] || primary_key
+as_extra    = " AND %s.%s = %s" % [
+reflection.active_record.connection.quote_column_name("#{source_reflection.options[:as]}_type")
-                            klass.quote_value(source_reflection.active_record.base_class.name)
-                          ]
-                        else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                          ]
+                        else
+                          second_key = source_reflection.options[:foreign_key] || klass.to_s.classify.foreign_key
-                        end
-                      end
+                      
+                      " LEFT OUTER JOIN %s ON (%s.%s = %s.%s%s%s%s) " % [
+                        table_alias_for(through_reflection.klass.table_name, aliased_join_table_name),
+                        parent.aliased_table_name, reflection.active_record.connection.quote_column_name(parent.primary_key),
+                        aliased_join_table_name, reflection.active_record.connection.quote_column_name(jt_foreign_key), 
+                        jt_as_extra, jt_source_extra, jt_sti_extra
+                      ] +
+                      " LEFT OUTER JOIN %s ON (%s.%s = %s.%s%s) " % [
+                        table_name_and_alias, 
+                        aliased_table_name, reflection.active_record.connection.quote_column_name(first_key),
+                        aliased_join_table_name, reflection.active_record.connection.quote_column_name(second_key),
+                        as_extra
+                      ]
-                    
-                    when reflection.macro == :has_many && reflection.options[:as]
-                      " LEFT OUTER JOIN %s ON %s.%s = %s.%s AND %s.%s = %s" % [
@@ -1652 +1668 @@
-            end
-            
-            protected
+
-              def pluralize(table_name)
-                ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
-              end