Ticket #6461: 0001-Nested-has_many-through-associations.patch

a/activerecord/lib/active_record/associations.rb

@@ -1700 +1700 @@
-              @aliased_table_name = table_name #.tr('.', '_') # start with the table name, sub out any .'s
-              @parent_table_name  = parent.active_record.table_name
-
-#{aliased_table_name.downcase}\s
+"?#{aliased_table_name.downcase}"?\s+
-                join_dependency.table_aliases[aliased_table_name] += 1
-              end
-

a/activerecord/lib/active_record/associations/has_many_through_association.rb

@@ -4 +4 @@
-      def initialize(owner, reflection)
-        super
-        reflection.check_validity!
-        @finder_sql = construct_conditions
-        construct_sql
-      end
-
-      def find(*args)
-        options = args.extract_options!
-
-"#{@finder_sql}"
+construct_conditions
-        if sanitized_conditions = sanitize_sql(options[:conditions])
-
+= conditions.dup 
-        end
-        options[:conditions] = conditions
-
@@ -25 +23 @@
-
-        options[:select]  = construct_select(options[:select])
-        options[:from]  ||= construct_from
-(options[:joins])
+ + " #{options[:joins]}"
-        options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil?
-
-        merge_options_from_reflection!(options)
@@ -46 +44 @@
-      # either is a new record.  Calls create! so you can rescue errors.
-      #
-      # The :before_add and :after_add callbacks are not yet supported.
+      # Nested has_many :through is not yet supported.
-      def <<(*records)
-        return if records.empty?
-        through = @reflection.through_reflection
-        raise ActiveRecord::HasManyThroughCantAssociateNewRecords.new(@owner, through) if @owner.new_record?
-
-        klass = through.klass
-        klass.transaction do
-          flatten_deeper(records).each do |associate|
@@ -68 +66 @@
-      [:push, :concat].each { |method| alias_method method, :<< }
-
-      # Removes +records+ from this association.  Does not destroy +records+.
+      # For nested has_many :through associations, this only deletes the
+      # first-order links.
-      def delete(*records)
-        records = flatten_deeper(records)
-        records.each { |associate| raise_on_type_mismatch(associate) }
@@ -186 +186 @@
-          join_attributes
-        end
-
-        # Associate attributes pointing to owner, quoted.
-        def construct_quoted_owner_attributes(reflection)
-          if as = reflection.options[:as]
-            { "#{as}_id" => @owner.quoted_id,
-              "#{as}_type" => reflection.klass.quote_value(
-                @owner.class.base_class.name.to_s,
-                reflection.klass.columns_hash["#{as}_type"]) }
-          else
-            { reflection.primary_key_name => @owner.quoted_id }
-          end
-        end
-
-        # Build SQL conditions from attributes, qualified by table name.
-        def construct_conditions
-table_name = @reflection.through_reflection.quoted_table_name
-conditions = construct_quoted_owner_attributes(@reflection.through_reflection).map do |attr, value|
-"#{table_name}.#{attr} = #{value
+if @constructed_conditions.nil?
+  @join_components ||= construct_join_components
+@constructed_conditions = "#{@join_components[:remote_key]} = #{@owner.quoted_id} #{@join_components[:conditions]
-          end
-
-
+
-        end
-
-        def construct_from
@@ -216 +203 @@
-          selected = custom_select || @reflection.options[:select] || "#{@reflection.quoted_table_name}.*"
-        end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        end
-
-        def construct_scope
@@ -259 +221 @@
-             } }
-        end
-
-        def construct_sql
-          case
-            when @reflection.options[:finder_sql]
-              @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
-
-              @finder_sql = "#{@reflection.quoted_table_name}.#{@reflection.primary_key_name} = #{@owner.quoted_id}"
-              @finder_sql << " AND (#{conditions})" if conditions
-          end
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          else
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            end
-
-
-
-
+
+
+
+
+
+
-          end
-        end
-
-build_sti_condition
-through_reflection.quoted_table_name}.#{@reflection.through_reflection.klass.inheritance_column} = #{@reflection.klass.quote_value(@reflection.through_reflection.klass.name.demodulize)}"
+table_alias_for(table_name, table_alias)
+klass.connection.quote_table_name(table_name)} #{table_alias if table_name != table_alias}".strip
-        end
-
-
+
+
+
+
+
-
-        def has_cached_counter?
-          @owner.attribute_present?(cached_counter_attribute_name)

a/activerecord/lib/active_record/base.rb

@@ -1464 +1464 @@
-          sql << "WHERE (#{segments.join(") AND (")}) " unless segments.empty?
-        end
-
-
+
+
-          quoted_inheritance_column = connection.quote_column_name(inheritance_column)
-quoted_
-quoted_
+
+
-          end
-
-          " (#{type_condition}) "

a/activerecord/lib/active_record/reflection.rb

@@ -191 +191 @@
-            raise HasManyThroughAssociationPolymorphicError.new(active_record.name, self, source_reflection)
-          end
-          
- && source_reflection.options[:through].nil?
+
-            raise HasManyThroughSourceAssociationMacroError.new(self)
-          end
-        end

a/activerecord/test/cases/associations/join_model_test.rb

@@ -376 +376 @@
-    end
-  end
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_has_many_through_habtm

a/activerecord/test/models/author.rb

@@ -63 +63 @@
-
-  has_many :tagging,  :through => :posts # through polymorphic has_one
-  has_many :taggings, :through => :posts, :source => :taggings # through polymorphic has_many
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  has_many :post_categories, :through => :posts, :source => :categories
-
-  belongs_to :author_address, :dependent => :destroy