Extend the block scoping from PR Casecommons#542 extends to associated_against subqueries. Further reduce big table scans, reduce corpus of scans.

Author: ydev-truss

lib/pg_search/configuration/association.rb

@@ -19,8 +19,8 @@ def table_name
         @model.reflect_on_association(@name).table_name
       end
 
-      def join(primary_key)
-        "LEFT OUTER JOIN (#{relation(primary_key).to_sql}) #{subselect_alias} ON #{subselect_alias}.id = #{primary_key}"
+      def join(primary_key, &block)
+        "LEFT OUTER JOIN (#{relation(primary_key, &block).to_sql}) #{subselect_alias} ON #{subselect_alias}.id = #{primary_key}"
       end
 
       def subselect_alias
@@ -49,9 +49,13 @@ def selects_for_multiple_association
         end.join(", ")
       end
 
-      def relation(primary_key)
+      def relation(primary_key, &block)
         result = @model.unscoped.joins(@name).select("#{primary_key} AS id, #{selects}")
         result = result.group(primary_key) unless singular_association?
+
+        # Apply optional scoping block to associated relation
+        result = block.call(result) if block_given?
+
         result
       end
 

lib/pg_search/scope_options.rb

@@ -79,12 +79,12 @@ def increment_counter
 
     delegate :connection, :quoted_table_name, to: :model
 
-    def subquery
+    def subquery(&block)
       relation = model
         .unscoped
         .select("#{primary_key} AS pg_search_id")
         .select("#{rank} AS rank")
-        .joins(subquery_join)
+        .joins(subquery_join(&block))
         .where(conditions)
         .limit(nil)
         .offset(nil)
@@ -128,10 +128,10 @@ def primary_key
       "#{quoted_table_name}.#{connection.quote_column_name(model.primary_key)}"
     end
 
-    def subquery_join
+    def subquery_join(&block)
       if config.associations.any?
         config.associations.map do |association|
-          association.join(primary_key)
+          association.join(primary_key, &block)
         end.join(" ")
       end
     end