Upgrade QueryRelation to leverage eager_include/preload

Author: kbrock

Gemfile

@@ -66,7 +66,7 @@ gem "pg",                               ">=1.4.1",           :require => false
 gem "pg-dsn_parser",                    "~>0.1.1",           :require => false
 gem "prism",                            ">=0.25.0",          :require => false # Used by DescendantLoader
 gem "psych",                            ">=3.1",             :require => false # 3.1 safe_load changed positional to kwargs like aliases: true: https://github.com/ruby/psych/commit/4d4439d6d0adfcbd211ea295779315f1baa7dadd
-gem "query_relation",                   "~>0.1.0",           :require => false
+gem "query_relation",                   "~>0.2.0",           :require => false
 gem "rack",                             ">=2.2.20",          :require => false # https://github.com/advisories/GHSA-6xw4-3v39-52mm https://github.com/advisories/GHSA-6xw4-3v39-52mm https://github.com/advisories/GHSA-6xw4-3v39-52mm https://github.com/advisories/GHSA-6xw4-3v39-52mm https://github.com/advisories/GHSA-6xw4-3v39-52mm https://github.com/advisories/GHSA-6xw4-3v39-52mm
 gem "rack-attack",                      "~>6.5.0",           :require => false
 gem "rails",                            "~>7.2.0", ">= 7.2.2.1"

lib/acts_as_ar_scope.rb

@@ -4,7 +4,8 @@
 class ActsAsArScope < ActsAsArModel
   # user required to add aar_scope
   class << self
-    delegate :includes, :references, :limit, :order, :offset, :select, :where, :to => :aar_scope
+    # Standard query methods are delegated to the core active record classes
+    delegate :includes, :references, :eager_load, :preload, :limit, :order, :offset, :select, :where, :to => :aar_scope
     delegate :find, :first, :last, :find_by_id, :find_by, :count, :to => :aar_scope
 
     delegate :klass, :to => :aar_scope, :prefix => true

lib/rbac/filterer.rb

@@ -429,15 +429,11 @@ def select_from_order_columns(columns)
       end
     end
 
+    # NOTE: for ActsAsArModel, scope will be a QueryRelation
+    #       for ActsAsArScope, scope will be a standard AR scope
     def include_references(scope, klass, includes, references, exp_includes)
-      if scope.respond_to?(:eager_load)
-        # TODO: do we want to klass.prune_references(exp_includes)? (see same comment for inline_view? section)
-        scope.eager_load(references || {}).eager_load(exp_includes || {}).preload(includes)
-      else
-        # This is the AAAR / QueryRelation branch
-        # TODO: drop this fallback once https://github.com/ManageIQ/query_relation/pull/43 is merged
-        scope.references(references || {}).references(exp_includes || {}).includes(includes)
-      end
+      # TODO: do we want to klass.prune_references(exp_includes)? (see same comment for inline_view? section)
+      scope.eager_load(references || {}).eager_load(exp_includes || {}).preload(includes)
     end
 
     # @param includes [Array, Hash]