activerecord 4.0.4 → 4.1.16

data/lib/active_record/associations/join_dependency.rb

@@ -1,15 +1,79 @@
 module ActiveRecord
   module Associations
     class JoinDependency # :nodoc:
-      autoload :JoinPart,        'active_record/associations/join_dependency/join_part'
       autoload :JoinBase,        'active_record/associations/join_dependency/join_base'
       autoload :JoinAssociation, 'active_record/associations/join_dependency/join_association'
 
-      attr_reader :join_parts, :reflections, :alias_tracker, :base_klass
+      class Aliases # :nodoc:
+        def initialize(tables)
+          @tables = tables
+          @alias_cache = tables.each_with_object({}) { |table,h|
+            h[table.node] = table.columns.each_with_object({}) { |column,i|
+              i[column.name] = column.alias
+            }
+          }
+          @name_and_alias_cache = tables.each_with_object({}) { |table,h|
+            h[table.node] = table.columns.map { |column|
+              [column.name, column.alias]
+            }
+          }
+        end
+
+        def columns
+          @tables.flat_map { |t| t.column_aliases }
+        end
+
+        # An array of [column_name, alias] pairs for the table
+        def column_aliases(node)
+          @name_and_alias_cache[node]
+        end
+
+        def column_alias(node, column)
+          @alias_cache[node][column]
+        end
+
+        class Table < Struct.new(:node, :columns)
+          def table
+            Arel::Nodes::TableAlias.new node.table, node.aliased_table_name
+          end
+
+          def column_aliases
+            t = table
+            columns.map { |column| t[column.name].as Arel.sql column.alias }
+          end
+        end
+        Column = Struct.new(:name, :alias)
+      end
+
+      attr_reader :alias_tracker, :base_klass, :join_root
+
+      def self.make_tree(associations)
+        hash = {}
+        walk_tree associations, hash
+        hash
+      end
+
+      def self.walk_tree(associations, hash)
+        case associations
+        when Symbol, String
+          hash[associations.to_sym] ||= {}
+        when Array
+          associations.each do |assoc|
+            walk_tree assoc, hash
+          end
+        when Hash
+          associations.each do |k,v|
+            cache = hash[k] ||= {}
+            walk_tree v, cache
+          end
+        else
+          raise ConfigurationError, associations.inspect
+        end
+      end
 
       # base is the base class on which operation is taking place.
       # associations is the list of associations which are joined using hash, symbol or array.
-      # joins is the list of all string join commnads and arel nodes.
+      # joins is the list of all string join commands and arel nodes.
       #
       #  Example :
       #
@@ -19,216 +83,192 @@ module ActiveRecord
       #  end
       #
       #  If I execute `@physician.patients.to_a` then
-      #    base #=> Physician
-      #    associations #=> []
-      #    joins #=>  [#<Arel::Nodes::InnerJoin: ...]
+      #    base # => Physician
+      #    associations # => []
+      #    joins # =>  [#<Arel::Nodes::InnerJoin: ...]
       #
       #  However if I execute `Physician.joins(:appointments).to_a` then
-      #    base #=> Physician
-      #    associations #=> [:appointments]
-      #    joins #=>  []
+      #    base # => Physician
+      #    associations # => [:appointments]
+      #    joins # =>  []
       #
       def initialize(base, associations, joins)
-        @base_klass    = base
-        @table_joins   = joins
-        @join_parts    = [JoinBase.new(base)]
-        @associations  = {}
-        @reflections   = []
-        @alias_tracker = AliasTracker.new(base.connection, joins)
-        @alias_tracker.aliased_name_for(base.table_name) # Updates the count for base.table_name to 1
-        build(associations)
-      end
-
-      def graft(*associations)
-        associations.each do |association|
-          join_associations.detect {|a| association == a} ||
-            build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type)
-        end
-        self
+        @alias_tracker = AliasTracker.create(base.connection, joins)
+        @alias_tracker.aliased_name_for(base.table_name, base.table_name) # Updates the count for base.table_name to 1
+        tree = self.class.make_tree associations
+        @join_root = JoinBase.new base, build(tree, base)
+        @join_root.children.each { |child| construct_tables! @join_root, child }
       end
 
-      def join_associations
-        join_parts.last(join_parts.length - 1)
+      def reflections
+        join_root.drop(1).map!(&:reflection)
       end
 
-      def join_base
-        join_parts.first
+      def join_constraints(outer_joins)
+        joins = join_root.children.flat_map { |child|
+          make_inner_joins join_root, child
+        }
+
+        joins.concat outer_joins.flat_map { |oj|
+          if join_root.match? oj.join_root
+            walk join_root, oj.join_root
+          else
+            oj.join_root.children.flat_map { |child|
+              make_outer_joins oj.join_root, child
+            }
+          end
+        }
       end
 
-      def columns
-        join_parts.collect { |join_part|
-          table = join_part.aliased_table
-          join_part.column_names_with_alias.collect{ |column_name, aliased_name|
-            table[column_name].as Arel.sql(aliased_name)
+      def aliases
+        Aliases.new join_root.each_with_index.map { |join_part,i|
+          columns = join_part.column_names.each_with_index.map { |column_name,j|
+            Aliases::Column.new column_name, "t#{i}_r#{j}"
           }
-        }.flatten
+          Aliases::Table.new(join_part, columns)
+        }
       end
 
-      def instantiate(rows)
-        primary_key = join_base.aliased_primary_key
-        parents = {}
-
-        records = rows.map { |model|
-          primary_id = model[primary_key]
-          parent = parents[primary_id] ||= join_base.instantiate(model)
-          construct(parent, @associations, join_associations, model)
-          parent
-        }.uniq
+      def instantiate(result_set, aliases)
+        primary_key = aliases.column_alias(join_root, join_root.primary_key)
+        type_caster = result_set.column_type primary_key
 
-        remove_duplicate_results!(base_klass, records, @associations)
-        records
-      end
+        seen = Hash.new { |h,parent_klass|
+          h[parent_klass] = Hash.new { |i,parent_id|
+            i[parent_id] = Hash.new { |j,child_klass| j[child_klass] = {} }
+          }
+        }
 
-      protected
+        model_cache = Hash.new { |h,klass| h[klass] = {} }
+        parents = model_cache[join_root]
+        column_aliases = aliases.column_aliases join_root
 
-      def remove_duplicate_results!(base, records, associations)
-        case associations
-        when Symbol, String
-          reflection = base.reflections[associations]
-          remove_uniq_by_reflection(reflection, records)
-        when Array
-          associations.each do |association|
-            remove_duplicate_results!(base, records, association)
-          end
-        when Hash
-          associations.each_key do |name|
-            reflection = base.reflections[name]
-            remove_uniq_by_reflection(reflection, records)
-
-            parent_records = []
-            records.each do |record|
-              if descendant = record.send(reflection.name)
-                if reflection.collection?
-                  parent_records.concat descendant.target.uniq
-                else
-                  parent_records << descendant
-                end
-              end
-            end
+        result_set.each { |row_hash|
+          parent_key = primary_key ? row_hash[primary_key] : row_hash
+          primary_id = type_caster.type_cast parent_key
+          parent = parents[primary_id] ||= join_root.instantiate(row_hash, column_aliases)
+          construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+        }
 
-            remove_duplicate_results!(reflection.klass, parent_records, associations[name]) unless parent_records.empty?
-          end
-        end
+        parents.values
       end
 
-      def cache_joined_association(association)
-        associations = []
-        parent = association.parent
-        while parent != join_base
-          associations.unshift(parent.reflection.name)
-          parent = parent.parent
-        end
-        ref = @associations
-        associations.each do |key|
-          ref = ref[key]
-        end
-        ref[association.reflection.name] ||= {}
+      private
+
+      def make_constraints(parent, child, tables, join_type)
+        chain         = child.reflection.chain
+        foreign_table = parent.table
+        foreign_klass = parent.base_klass
+        child.join_constraints(foreign_table, foreign_klass, child, join_type, tables, child.reflection.scope_chain, chain)
       end
 
-      def build(associations, parent = nil, join_type = Arel::InnerJoin)
-        parent ||= join_parts.last
-        case associations
-        when Symbol, String
-          reflection = parent.reflections[associations.intern] or
-          raise ConfigurationError, "Association named '#{ associations }' was not found on #{ parent.base_klass.name }; perhaps you misspelled it?"
-          unless join_association = find_join_association(reflection, parent)
-            @reflections << reflection
-            join_association = build_join_association(reflection, parent)
-            join_association.join_type = join_type
-            @join_parts << join_association
-            cache_joined_association(join_association)
-          end
-          join_association
-        when Array
-          associations.each do |association|
-            build(association, parent, join_type)
-          end
-        when Hash
-          associations.keys.sort_by { |a| a.to_s }.each do |name|
-            join_association = build(name, parent, join_type)
-            build(associations[name], join_association, join_type)
-          end
-        else
-          raise ConfigurationError, associations.inspect
-        end
+      def make_outer_joins(parent, child)
+        tables    = table_aliases_for(parent, child)
+        join_type = Arel::Nodes::OuterJoin
+        joins     = make_constraints parent, child, tables, join_type
+
+        joins.concat child.children.flat_map { |c| make_outer_joins(child, c) }
       end
 
-      def find_join_association(name_or_reflection, parent)
-        if String === name_or_reflection
-          name_or_reflection = name_or_reflection.to_sym
-        end
+      def make_inner_joins(parent, child)
+        tables    = child.tables
+        join_type = Arel::Nodes::InnerJoin
+        joins     = make_constraints parent, child, tables, join_type
 
-        join_associations.detect { |j|
-          j.reflection == name_or_reflection && j.parent == parent
+        joins.concat child.children.flat_map { |c| make_inner_joins(child, c) }
+      end
+
+      def table_aliases_for(parent, node)
+        node.reflection.chain.map { |reflection|
+          alias_tracker.aliased_table_for(
+            reflection.table_name,
+            table_alias_for(reflection, parent, reflection != node.reflection)
+          )
         }
       end
 
-      def remove_uniq_by_reflection(reflection, records)
-        if reflection && reflection.collection?
-          records.each { |record| record.send(reflection.name).target.uniq! }
-        end
+      def construct_tables!(parent, node)
+        node.tables = table_aliases_for(parent, node)
+        node.children.each { |child| construct_tables! node, child }
       end
 
-      def build_join_association(reflection, parent)
-        JoinAssociation.new(reflection, self, parent)
+      def table_alias_for(reflection, parent, join)
+        name = "#{reflection.plural_name}_#{parent.table_name}"
+        name << "_join" if join
+        name
       end
 
-      def construct(parent, associations, join_parts, row)
-        case associations
-        when Symbol, String
-          name = associations.to_s
+      def walk(left, right)
+        intersection, missing = right.children.map { |node1|
+          [left.children.find { |node2| node1.match? node2 }, node1]
+        }.partition(&:first)
 
-          join_part = join_parts.detect { |j|
-            j.reflection.name.to_s == name &&
-              j.parent_table_name == parent.class.table_name }
+        ojs = missing.flat_map { |_,n| make_outer_joins left, n }
+        intersection.flat_map { |l,r| walk l, r }.concat ojs
+      end
 
-            raise(ConfigurationError, "No such association") unless join_part
+      def find_reflection(klass, name)
+        klass._reflect_on_association(name) or
+          raise ConfigurationError, "Association named '#{ name }' was not found on #{ klass.name }; perhaps you misspelled it?"
+      end
 
-            join_parts.delete(join_part)
-            construct_association(parent, join_part, row)
-        when Array
-          associations.each do |association|
-            construct(parent, association, join_parts, row)
-          end
-        when Hash
-          associations.sort_by { |k,_| k.to_s }.each do |association_name, assoc|
-            association = construct(parent, association_name, join_parts, row)
-            construct(association, assoc, join_parts, row) if association
+      def build(associations, base_klass)
+        associations.map do |name, right|
+          reflection = find_reflection base_klass, name
+          reflection.check_validity!
+
+          if reflection.options[:polymorphic]
+            raise EagerLoadPolymorphicError.new(reflection)
           end
-        else
-          raise ConfigurationError, associations.inspect
+
+          JoinAssociation.new reflection, build(right, reflection.klass)
         end
       end
 
-      def construct_association(record, join_part, row)
-        return if record.id.to_s != join_part.parent.record_id(row).to_s
+      def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+        primary_id  = ar_parent.id
 
-        macro = join_part.reflection.macro
-        if macro == :has_one
-          return record.association(join_part.reflection.name).target if record.association_cache.key?(join_part.reflection.name)
-          association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
-          set_target_and_inverse(join_part, association, record)
-        else
-          association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
-          case macro
-          when :has_many, :has_and_belongs_to_many
-            other = record.association(join_part.reflection.name)
+        parent.children.each do |node|
+          if node.reflection.collection?
+            other = ar_parent.association(node.reflection.name)
             other.loaded!
-            other.target.push(association) if association
-            other.set_inverse_instance(association)
-          when :belongs_to
-            set_target_and_inverse(join_part, association, record)
           else
-            raise ConfigurationError, "unknown macro: #{join_part.reflection.macro}"
+            if ar_parent.association_cache.key?(node.reflection.name)
+              model = ar_parent.association(node.reflection.name).target
+              construct(model, node, row, rs, seen, model_cache, aliases)
+              next
+            end
+          end
+
+          key = aliases.column_alias(node, node.primary_key)
+          id = row[key]
+          next if id.nil?
+
+          model = seen[parent.base_klass][primary_id][node.base_klass][id]
+
+          if model
+            construct(model, node, row, rs, seen, model_cache, aliases)
+          else
+            model = construct_model(ar_parent, node, row, model_cache, id, aliases)
+            seen[parent.base_klass][primary_id][node.base_klass][id] = model
+            construct(model, node, row, rs, seen, model_cache, aliases)
           end
         end
-        association
       end
 
-      def set_target_and_inverse(join_part, association, record)
-        other = record.association(join_part.reflection.name)
-        other.target = association
-        other.set_inverse_instance(association)
+      def construct_model(record, node, row, model_cache, id, aliases)
+        model = model_cache[node][id] ||= node.instantiate(row,
+                                                           aliases.column_aliases(node))
+        other = record.association(node.reflection.name)
+
+        if node.reflection.collection?
+          other.target.push(model)
+        else
+          other.target = model
+        end
+
+        other.set_inverse_instance(model)
+        model
       end
     end
   end

data/lib/active_record/associations/preloader/association.rb

@@ -3,6 +3,7 @@ module ActiveRecord
     class Preloader
       class Association #:nodoc:
         attr_reader :owners, :reflection, :preload_scope, :model, :klass
+        attr_reader :preloaded_records
 
         def initialize(klass, owners, reflection, preload_scope)
           @klass         = klass
@@ -12,15 +13,14 @@ module ActiveRecord
           @model         = owners.first && owners.first.class
           @scope         = nil
           @owners_by_key = nil
+          @preloaded_records = []
         end
 
-        def run
-          unless owners.first.association(reflection.name).loaded?
-            preload
-          end
+        def run(preloader)
+          preload(preloader)
         end
 
-        def preload
+        def preload(preloader)
           raise NotImplementedError
         end
 
@@ -29,6 +29,10 @@ module ActiveRecord
         end
 
         def records_for(ids)
+          query_scope(ids)
+        end
+
+        def query_scope(ids)
           scope.where(association_key.in(ids))
         end
 
@@ -52,13 +56,16 @@ module ActiveRecord
           raise NotImplementedError
         end
 
-        # We're converting to a string here because postgres will return the aliased association
-        # key in a habtm as a string (for whatever reason)
         def owners_by_key
-          @owners_by_key ||= owners.group_by do |owner|
-            key = owner[owner_key_name]
-            key && key.to_s
-          end
+          @owners_by_key ||= if key_conversion_required?
+                               owners.group_by do |owner|
+                                 owner[owner_key_name].to_s
+                               end
+                             else
+                               owners.group_by do |owner|
+                                 owner[owner_key_name]
+                               end
+                             end
         end
 
         def options
@@ -67,38 +74,64 @@ module ActiveRecord
 
         private
 
-        def associated_records_by_owner
+        def associated_records_by_owner(preloader)
           owners_map = owners_by_key
           owner_keys = owners_map.keys.compact
 
-          if klass.nil? || owner_keys.empty?
-            records = []
-          else
+          # Each record may have multiple owners, and vice-versa
+          records_by_owner = owners.each_with_object({}) do |owner,h|
+            h[owner] = []
+          end
+
+          if owner_keys.any?
             # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
             # Make several smaller queries if necessary or make one query if the adapter supports it
             sliced  = owner_keys.each_slice(klass.connection.in_clause_length || owner_keys.size)
-            records = sliced.map { |slice| records_for(slice).to_a }.flatten
-          end
-
-          # Each record may have multiple owners, and vice-versa
-          records_by_owner = Hash[owners.map { |owner| [owner, []] }]
-          records.each do |record|
-            owner_key = record[association_key_name].to_s
 
-            owners_map[owner_key].each do |owner|
-              records_by_owner[owner] << record
+            records = load_slices sliced
+            records.each do |record, owner_key|
+              owners_map[owner_key].each do |owner|
+                records_by_owner[owner] << record
+              end
             end
           end
+
           records_by_owner
         end
 
+        def key_conversion_required?
+          association_key_type != owner_key_type
+        end
+
+        def association_key_type
+          column = @klass.column_types[association_key_name.to_s]
+          column && column.type
+        end
+
+        def owner_key_type
+          column = @model.column_types[owner_key_name.to_s]
+          column && column.type
+        end
+
+        def load_slices(slices)
+          @preloaded_records = slices.flat_map { |slice|
+            records_for(slice)
+          }
+
+          @preloaded_records.map { |record|
+            key = record[association_key_name]
+            key = key.to_s if key_conversion_required?
+
+            [record, key]
+          }
+        end
+
         def reflection_scope
           @reflection_scope ||= reflection.scope ? klass.unscoped.instance_exec(nil, &reflection.scope) : klass.unscoped
         end
 
         def build_scope
           scope = klass.unscoped
-          scope.default_scoped = true
 
           values         = reflection_scope.values
           preload_values = preload_scope.values
@@ -106,14 +139,23 @@ module ActiveRecord
           scope.where_values      = Array(values[:where])      + Array(preload_values[:where])
           scope.references_values = Array(values[:references]) + Array(preload_values[:references])
 
-          scope.select!   preload_values[:select] || values[:select] || table[Arel.star]
+          scope._select!   preload_values[:select] || values[:select] || table[Arel.star]
           scope.includes! preload_values[:includes] || values[:includes]
 
+          if preload_values.key? :order
+            scope.order! preload_values[:order]
+          else
+            if values.key? :order
+              scope.order! values[:order]
+            end
+          end
+
           if options[:as]
             scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name })
           end
 
-          scope
+          scope.unscope_values = Array(values[:unscope])
+          klass.default_scoped.merge(scope)
         end
       end
     end

data/lib/active_record/associations/preloader/collection_association.rb

@@ -9,8 +9,8 @@ module ActiveRecord
           super.order(preload_scope.values[:order] || reflection_scope.values[:order])
         end
 
-        def preload
-          associated_records_by_owner.each do |owner, records|
+        def preload(preloader)
+          associated_records_by_owner(preloader).each do |owner, records|
             association = owner.association(reflection.name)
             association.loaded!
             association.target.concat(records)

data/lib/active_record/associations/preloader/has_many_through.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       class HasManyThrough < CollectionAssociation #:nodoc:
         include ThroughAssociation
 
-        def associated_records_by_owner
+        def associated_records_by_owner(preloader)
           records_by_owner = super
 
           if reflection_scope.distinct_value

data/lib/active_record/associations/preloader/singular_association.rb

@@ -5,13 +5,13 @@ module ActiveRecord
 
         private
 
-        def preload
-          associated_records_by_owner.each do |owner, associated_records|
+        def preload(preloader)
+          associated_records_by_owner(preloader).each do |owner, associated_records|
             record = associated_records.first
 
             association = owner.association(reflection.name)
             association.target = record
-            association.set_inverse_instance(record)
+            association.set_inverse_instance(record) if record
           end
         end