Slimmer #includes behaviour

activerecord/CHANGELOG.md

@@ -1,3 +1,34 @@
+*   Slimmer `#includes` behaviour.
+
+    The goal of the change is to make #includes slimmer - only join the table required to satisfy the referenced tables and preload all other associations independently.
+
+    The following two statements would demonstrate the difference BEFORE the change:
+
+    ```sh
+    > Author.includes(:books, :post).to_a
+
+      Author Load (0.1ms)  SELECT "authors".* FROM "authors"
+      Book Load (0.3ms)  SELECT "books".* FROM "books" WHERE "books"."author_id" IN (?, ?, ?)  [["author_id", 1], ["author_id", 2], ["author_id", 3]]
+      Post Load (0.2ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" IN (?, ?, ?)  [["author_id", 1], ["author_id", 2], ["author_id", 3]]
+
+    > Author.includes(:books, :post).where(books: { language: 'EN' }).to_a
+
+      SQL (0.3ms)  SELECT "authors"."id" AS t0_r0, "authors"."name" AS t0_r1, "authors"."author_address_id" AS t0_r2, "authors"."author_address_extra_id" AS t0_r3, "authors"."organization_id" AS t0_r4, "authors"."owned_essay_id" AS t0_r5, "books"."id" AS t1_r0, "books"."author_id" AS t1_r1, "books"."format" AS t1_r2, "books"."format_record_id" AS t1_r3, "books"."format_record_type" AS t1_r4, "books"."name" AS t1_r5, "books"."status" AS t1_r6, "books"."last_read" AS t1_r7, "books"."nullable_status" AS t1_r8, "books"."language" AS t1_r9, "books"."author_visibility" AS t1_r10, "books"."illustrator_visibility" AS t1_r11, "books"."font_size" AS t1_r12, "books"."difficulty" AS t1_r13, "books"."cover" AS t1_r14, "books"."isbn" AS t1_r15, "books"."external_id" AS t1_r16, "books"."original_name" AS t1_r17, "books"."published_on" AS t1_r18, "books"."boolean_status" AS t1_r19, "books"."tags_count" AS t1_r20, "books"."created_at" AS t1_r21, "books"."updated_at" AS t1_r22, "books"."updated_on" AS t1_r23, "posts"."id" AS t2_r0, "posts"."author_id" AS t2_r1, "posts"."team_id" AS t2_r2, "posts"."title" AS t2_r3, "posts"."body" AS t2_r4, "posts"."type" AS t2_r5, "posts"."legacy_comments_count" AS t2_r6, "posts"."taggings_with_delete_all_count" AS t2_r7, "posts"."taggings_with_destroy_count" AS t2_r8, "posts"."tags_count" AS t2_r9, "posts"."indestructible_tags_count" AS t2_r10, "posts"."tags_with_destroy_count" AS t2_r11, "posts"."tags_with_nullify_count" AS t2_r12 FROM "authors" LEFT OUTER JOIN "books" ON "books"."author_id" = "authors"."id" LEFT OUTER JOIN "posts" ON "posts"."author_id" = "authors"."id" WHERE "books"."language" IS NULL
+
+    ```
+
+    And this is AFTER the change:
+
+    ```sh
+    > Author.includes(:books, :post).where(books: { language: 'EN' }).to_a
+
+      SQL (0.2ms)  SELECT "authors"."id" AS t0_r0, "authors"."name" AS t0_r1, "authors"."author_address_id" AS t0_r2, "authors"."author_address_extra_id" AS t0_r3, "authors"."organization_id" AS t0_r4, "authors"."owned_essay_id" AS t0_r5, "books"."id" AS t1_r0, "books"."author_id" AS t1_r1, "books"."format" AS t1_r2, "books"."format_record_id" AS t1_r3, "books"."format_record_type" AS t1_r4, "books"."name" AS t1_r5, "books"."status" AS t1_r6, "books"."last_read" AS t1_r7, "books"."nullable_status" AS t1_r8, "books"."language" AS t1_r9, "books"."author_visibility" AS t1_r10, "books"."illustrator_visibility" AS t1_r11, "books"."font_size" AS t1_r12, "books"."difficulty" AS t1_r13, "books"."cover" AS t1_r14, "books"."isbn" AS t1_r15, "books"."external_id" AS t1_r16, "books"."original_name" AS t1_r17, "books"."published_on" AS t1_r18, "books"."boolean_status" AS t1_r19, "books"."tags_count" AS t1_r20, "books"."created_at" AS t1_r21, "books"."updated_at" AS t1_r22, "books"."updated_on" AS t1_r23 FROM "authors" LEFT OUTER JOIN "books" ON "books"."author_id" = "authors"."id" WHERE "books"."language" IS NULL
+      Post Load (0.2ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" IN (?, ?)  [["author_id", 2], ["author_id", 3]]
+
+    ```
+
+    *Artur Petrov*
+
 *   Remove deprecated `Tasks::DatabaseTasks.schema_file_type`.
 
     *Rafael Mendonça França*

activerecord/lib/active_record.rb

@@ -111,6 +111,7 @@ module ActiveRecord
       autoload :Calculations
       autoload :Delegation
       autoload :FinderMethods
+      autoload :IncludesTracker
       autoload :PredicateBuilder
       autoload :QueryMethods
       autoload :SpawnMethods

activerecord/lib/active_record/relation.rb

@@ -17,7 +17,7 @@ class Relation
     VALUE_METHODS = MULTI_VALUE_METHODS + SINGLE_VALUE_METHODS + CLAUSE_METHODS
 
     include Enumerable
-    include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation
+    include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, IncludesTracker, Explain, Delegation
 
     attr_reader :table, :klass, :loaded, :predicate_builder
     attr_accessor :skip_preloading_value
@@ -838,7 +838,7 @@ def self.strict_loading_value
 
     def preload_associations(records) # :nodoc:
       preload = preload_values
-      preload += includes_values unless eager_loading?
+      preload += eager_loading? ? includes_values_non_referenced : includes_values
       scope = strict_loading_value ? StrictLoadingScope : nil
       preload.each do |associations|
         ActiveRecord::Associations::Preloader.new(records: records, associations: associations, scope: scope).call

activerecord/lib/active_record/relation/calculations.rb

@@ -189,7 +189,7 @@ def async_sum(identity_or_column = nil)
     #      end
     def calculate(operation, column_name)
       if has_include?(column_name)
-        relation = apply_join_dependency
+        relation = apply_join_dependency(full_eager_loading: true)
 
         if operation.to_s.downcase == "count"
           unless distinct_value || distinct_select?(column_name || select_for_count)
@@ -251,7 +251,7 @@ def pluck(*column_names)
       end
 
       if has_include?(column_names.first)
-        relation = apply_join_dependency
+        relation = apply_join_dependency(full_eager_loading: true)
         relation.pluck(*column_names)
       else
         klass.disallow_raw_sql!(column_names)
@@ -315,7 +315,7 @@ def ids
       end
 
       if has_include?(primary_key)
-        relation = apply_join_dependency.distinct
+        relation = apply_join_dependency(full_eager_loading: true).distinct
         return relation.ids
       end
 

activerecord/lib/active_record/relation/finder_methods.rb

@@ -407,9 +407,10 @@ def construct_relation_for_exists(conditions)
         relation
       end
 
-      def apply_join_dependency(eager_loading: group_values.empty?)
+      def apply_join_dependency(eager_loading: group_values.empty?, full_eager_loading: false)
+        selected_includes_values = full_eager_loading ? includes_values : includes_values_referenced
         join_dependency = construct_join_dependency(
-          eager_load_values | includes_values, Arel::Nodes::OuterJoin
+          eager_load_values | selected_includes_values, Arel::Nodes::OuterJoin
         )
         relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
 

activerecord/lib/active_record/relation/includes_tracker.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  # Determine includes which are used / not used in refererences and joins.
+  module IncludesTracker # :nodoc:
+    TABLE_WITH_POSTFIX_ALIAS = "_join"
+
+    def includes_values_referenced
+      select_includes_values_with_references(:present?)
+    end
+
+    def includes_values_non_referenced
+      select_includes_values_with_references(:blank?)
+    end
+
+    private
+      def select_includes_values_with_references(intersect_matcher)
+        all_references = (references_values + joins_values + left_outer_joins_values).map(&:to_s)
+
+        return includes_values if references_table_with_postfix_alias?(all_references)
+
+        includes_tree = ActiveRecord::Associations::JoinDependency.make_tree(includes_values)
+        traverse_tree_with_model(includes_tree, self) do |reflection|
+          next true unless reliable_reflection_match?(reflection)
+
+          (possible_includes_tables(reflection) & all_references).public_send(intersect_matcher)
+        end
+      end
+
+      # Possible includes tables contain:
+      # - Current table name;
+      # - All `through` table names;
+      # - Special plural table name;
+      # - Association name (`references` may save directly);
+      # - Join table for HABTM.
+      def possible_includes_tables(reflection)
+        all_possible_includes_tables =
+          reflection.collect_join_chain.map(&:table_name) <<
+          reflection.alias_candidate(reflection.table_name) <<
+          reflection.name.to_s
+
+        if inferable_reflection_table_name?(reflection)
+          all_possible_includes_tables << reflection.join_table
+        end
+
+        all_possible_includes_tables
+      end
+
+      def references_table_with_postfix_alias?(all_references)
+        all_references.any? { _1.end_with?(TABLE_WITH_POSTFIX_ALIAS) }
+      end
+
+      def reliable_reflection_match?(reflection)
+        reflection && inferable_reflection_klass?(reflection)
+      end
+
+      def inferable_reflection_klass?(reflection)
+        !reflection.polymorphic?
+      end
+
+      def inferable_reflection_table_name?(reflection)
+        !reflection.through_reflection?
+      end
+
+      def traverse_tree_with_model(hash, model, &block)
+        return hash if model.nil?
+
+        result = []
+        hash.each do |association, nested_hash|
+          current = model.reflect_on_association(association)
+
+          next_model = reliable_reflection_match?(current) ? current.klass : nil
+          current_result = traverse_tree_with_model(nested_hash, next_model, &block)
+          next (result << { association => current_result }) if current_result.any?
+
+          result << association if block.call(current)
+        end
+        result
+      end
+  end
+end