dbee-active_record 2.1.0.pre.alpha.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d42ea7f3b391ad5014264a4b914339bf7dff8582aebe85c4c3180576ae7648
-  data.tar.gz: e63553d0dcc906a38b336767dfcf10bcc162807682ae866f4450a80185993b8e
+  metadata.gz: 6b68d2e6c79fa4d3bb1ff26726983750cc112f60af4355eee8795cd748d9be9c
+  data.tar.gz: 5e0a15f3f85f465d7bc6fc79a9c74c6847e72be6a5a4ac25ec626f54bec985c4
 SHA512:
-  metadata.gz: f727e65305615a6e5b2450654ce4bb174674970be4b6855922035dac6bc8378862a003f0c1ec4677433d560dee4f5ca3b9094b57a4be8eae6a7d78720c805910
-  data.tar.gz: 21d91630d8ba8407550dcdd6d8a7aab9bc7dc52ad39679ed5b673f59263f2761e55505c61b8cafcc2ce09a31fee1571e58e9fffc76b24f1dd7a5d3d62e3b4ef7
+  metadata.gz: 23bb62872a7c2412f0e8745b392b93fbd0c5bc1c7cfaefdc6503f9add73566b774378a69efe82eea53ee9f20c461585d163b96cc715541133b825f4906f87b89
+  data.tar.gz: cff34e878e7abb09865d88893af53e4d578077742ed4768fcee6c612c546e44a5a4f340ea2f9f6051a60ce2a62d484fce411c15487a69da00ad04fa5cf8a512e

data/.circleci/config.yml

@@ -0,0 +1,84 @@
+version: 2.1
+
+orbs:
+  status_to_ms_teams: bluemarblepayroll/status_to_ms_teams_pure_bash@1.0.0
+
+jobs:
+  build:
+    parameters:
+      use-bundler-cache:
+        type: boolean
+        default: true
+
+    docker:
+      - image: circleci/ruby:2.6.6-buster
+        environment:
+          FORBID_FOCUSED_SPECS: 1
+          AR_VERSION: 5
+      - image: mysql@sha256:f3515b6a6502d872d5a37db78e4d225c0fcbf8da65d1faf8ce4609c92e2cbaf0
+        environment:
+          MYSQL_DATABASE: dbee_test
+          MYSQL_ALLOW_EMPTY_PASSWORD: 1
+          MYSQL_USER: root
+        command:
+          mysqld --sql_mode=TRADITIONAL,NO_AUTO_VALUE_ON_ZERO
+    working_directory: ~/dbee-active_record
+    steps:
+      - checkout
+      - run: sudo apt-get --allow-releaseinfo-change update
+      - run: sudo apt-get update && sudo apt-get install -y git curl libmcrypt-dev default-mysql-client
+      - run: dockerize -wait tcp://localhost:3306 -timeout 1m
+      - run: cp spec/config/database.yaml.ci spec/config/database.yaml
+      - run: mysql -h 127.0.0.1 -u root -e 'CREATE DATABASE IF NOT EXISTS dbee_test;'
+
+      # TODO: wrap bundler caching logic into an Orb:
+      - when:
+          condition: << parameters.use-bundler-cache >>
+          steps:
+            - restore_cache:
+                key: v1.0.0-build-ruby-dependency-cache-{{ checksum "dbee-active_record.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum ".ruby-version" }}
+
+      - run: bundle install --path vendor/bundle
+
+      - when:
+          condition: << parameters.use-bundler-cache >>
+          steps:
+            - save_cache:
+                key: v1.0.0-build-ruby-dependency-cache-{{ checksum "dbee-active_record.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum ".ruby-version" }}
+                paths:
+                  - vendor/bundle
+
+      - store_artifacts:
+          path: Gemfile.lock
+
+      - run: bundle exec rubocop
+
+      - run: COVERAGE=true bundle exec rspec -r rspec_junit_formatter --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
+
+      - store_test_results:
+          path: test-results
+
+      - store_artifacts:
+          path: coverage
+
+      - status_to_ms_teams/report:
+          webhook_url: $MS_TEAMS_WEBHOOK_URL
+
+workflows:
+  version: 2.1
+  build:
+    jobs:
+      - build:
+          context: org-global
+  monthly-gem-dependency-refresh-check:
+    triggers:
+      - schedule:
+          cron: '0 0 1 * *'
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - build:
+          context: org-global
+          use-bundler-cache: false

data/.rubocop.yml

@@ -1,22 +1,17 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/LineLength:
   Max: 100
 
-Lint/RaiseException:
-  Enabled: True
-
-Lint/StructNewOverride:
-  Enabled: True
-
 Metrics/AbcSize:
-  Max: 16
+  Max: 20
   Exclude:
     - spec/db_helper.rb
 
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
     - let
     - it
     - describe
@@ -28,18 +23,9 @@ Metrics/BlockLength:
     - dbee-active_record.gemspec
 
 Metrics/ClassLength:
-  Max: 125
+  Max: 150
 
 Metrics/MethodLength:
   Max: 25
   Exclude:
     - spec/db_helper.rb
-
-Style/HashEachMethods:
-  Enabled: True
-
-Style/HashTransformKeys:
-  Enabled: True
-
-Style/HashTransformValues:
-  Enabled: True

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.6

data/CHANGELOG.md

@@ -1,9 +1,27 @@
-# 2.1.0 (TBD)
+# 2.3.0 (October 4th, 2021)
+
+### Additions:
+
+* Support for Dbee::Query#offset.
+# 2.2.0 (March 11th, 2021)
+
+### Additions:
+
+* Support for graph based models.
+
+# 2.1.2 (October 15th, 2020)
+
+* Improved test coverage for Where maker
+* Fixed bug in Where maker which resulted in only IS NULL predicates being generated, even in cases
+  of when IS NOT NULL intended.
+
+# 2.1.1 (July 15th, 2020)
 
 ### Additions:
 
 * Implemented Dbee::Query::Field#aggregator
 * Implemented Dbee::Query::Field#filters
+* Implemented base case when a Dbee::Query contains no fields
 
 ### Changes:
 

data/Guardfile

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-guard :rspec, cmd: 'DISABLE_SIMPLECOV=true bundle exec rspec --format=documentation' do
+command = 'DISABLE_SIMPLECOV=true bundle exec rspec --format=documentation --order=defined'
+guard :rspec, cmd: command do
   require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 

data/README.md

@@ -1,17 +1,17 @@
 # Dbee Active Record Provider
 
-[![Gem Version](https://badge.fury.io/rb/dbee-active_record.svg)](https://badge.fury.io/rb/dbee-active_record) [![Build Status](https://travis-ci.org/bluemarblepayroll/dbee-active_record.svg?branch=master)](https://travis-ci.org/bluemarblepayroll/dbee-active_record) [![Maintainability](https://api.codeclimate.com/v1/badges/7f74a4e546bebb603cce/maintainability)](https://codeclimate.com/github/bluemarblepayroll/dbee-active_record/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/7f74a4e546bebb603cce/test_coverage)](https://codeclimate.com/github/bluemarblepayroll/dbee-active_record/test_coverage) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![CircleCI](https://circleci.com/bb/bluemarble-ondemand/dbee-active_record/tree/master.svg?style=svg&circle-token=088be69cf3978bc526add53690e4919eb2fcce5c)](https://circleci.com/bb/bluemarble-ondemand/dbee-active_record/tree/master)
 
 Dbee does not ship with a SQL generator by default.  This library plugs into Dbee to provide SQL generation via ActiveRecord.  Technically speaking: this library does not use ActiveRecord for anything except connection information.  All actual SQL generation is performed using Arel.  There is no actual coupling of your domain ActiveRecord subclasses to Dbee.
 
-This library is a plugin for [Dbee](https://github.com/bluemarblepayroll/dbee).  The Dbee repositories README file contains information about how to use the Data Model and Query API's.
+This library is a plugin for Dbee.  The Dbee repositories README file contains information about how to use the Data Model and Query API's.
 
 ## Installation
 
 To install through Rubygems:
 
 ````
-gem install install dbee-active_record
+gem install dbee-active_record
 ````
 
 You can also add this to your Gemfile:
@@ -76,7 +76,7 @@ Note: ensure you have proper authorization before trying to publish new versions
 After code changes have successfully gone through the Pull Request review process then the following steps should be followed for publishing new versions:
 
 1. Merge Pull Request into master
-2. Update `lib/dbee-active_record/version.rb` using [semantic versioning](https://semver.org/)
+2. Update `version.rb` using [semantic versioning](https://semver.org/)
 3. Install dependencies: `bundle`
 4. Update `CHANGELOG.md` with release notes
 5. Commit & push master to remote and ensure CI builds master successfully

data/dbee-active_record.gemspec

@@ -11,21 +11,13 @@ Gem::Specification.new do |s|
     By default Dbee ships with no underlying SQL generator.  This library will plug in ActiveRecord into Dbee and Dbee will use it for SQL generation.
   DESCRIPTION
 
-  s.authors     = ['Matthew Ruggio']
-  s.email       = ['mruggio@bluemarblepayroll.com']
+  s.authors     = ['Matthew Ruggio', 'Craig Kattner']
+  s.email       = ['mruggio@bluemarblepayroll.com', 'ckattner@bluemarblepayroll.com']
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir      = 'exe'
   s.executables = []
-  s.homepage    = 'https://github.com/bluemarblepayroll/dbee-active_record'
   s.license     = 'MIT'
-  s.metadata    = {
-    'bug_tracker_uri' => 'https://github.com/bluemarblepayroll/dbee-active_record/issues',
-    'changelog_uri' => 'https://github.com/bluemarblepayroll/dbee-active_record/blob/master/CHANGELOG.md',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/dbee-active_record',
-    'homepage_uri' => s.homepage,
-    'source_code_uri' => s.homepage
-  }
 
   s.required_ruby_version = '>= 2.5'
 
@@ -42,15 +34,21 @@ Gem::Specification.new do |s|
     end
 
   s.add_dependency('activerecord', activerecord_version)
-  s.add_dependency('dbee', '=2.1.0.pre.alpha')
+  s.add_dependency('dbee', '~>3', '>=3.1.0')
 
   s.add_development_dependency('guard-rspec', '~>4.7')
   s.add_development_dependency('mysql2', '~>0.5')
   s.add_development_dependency('pry', '~>0')
+  s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake', '~> 13')
   s.add_development_dependency('rspec', '~> 3.8')
-  s.add_development_dependency('rubocop', '~>0.81.0')
-  s.add_development_dependency('simplecov', '~>0.17.0')
+  s.add_development_dependency('rspec_junit_formatter')
+  s.add_development_dependency('rubocop', '~> 1')
+  s.add_development_dependency('rubocop-rake')
+  s.add_development_dependency('rubocop-rspec')
+  s.add_development_dependency('simplecov', '~>0.19.0')
   s.add_development_dependency('simplecov-console', '~>0.7.0')
   s.add_development_dependency('sqlite3', '~>1')
+  # Helpful to spot differences in longer SQL queries:
+  s.add_development_dependency('super_diff', '~>0.6')
 end

data/lib/dbee/providers/active_record_provider/expression_builder.rb

@@ -7,52 +7,28 @@
 # LICENSE file in the root directory of this source tree.
 #
 
-require_relative 'expression_builder/constraint'
-require_relative 'expression_builder/order'
-require_relative 'expression_builder/select'
-require_relative 'expression_builder/where'
+require_relative 'maker'
 
 module Dbee
   module Providers
     class ActiveRecordProvider
-      # This class can generate an Arel expression tree.
-      class ExpressionBuilder
+      # This class can generate an Arel expression tree given a Dbee::Schema
+      # and Dbee::Query.
+      class ExpressionBuilder < Maker # :nodoc: all
         class MissingConstraintError < StandardError; end
 
-        def initialize(model, table_alias_maker, column_alias_maker)
-          @model              = model
-          @table_alias_maker  = table_alias_maker
-          @column_alias_maker = column_alias_maker
-          @requires_group_by  = false
-          @group_by_columns   = []
+        def initialize(schema, table_alias_maker, column_alias_maker)
+          super(column_alias_maker)
 
-          clear
+          @schema            = schema
+          @table_alias_maker = table_alias_maker
         end
 
-        def clear
-          @base_table = make_table(model.table, model.name)
+        def to_sql(query)
+          reset_query_state
+          build_query(query)
 
-          build(base_table)
-
-          add_partitioners(base_table, model.partitioners)
-        end
-
-        def add(query)
-          query.fields.each   { |field| add_field(field) }
-          query.sorters.each  { |sorter| add_sorter(sorter) }
-          query.filters.each  { |filter| add_filter(filter) }
-
-          add_limit(query.limit)
-
-          self
-        end
-
-        def to_sql
-          if requires_group_by
-            @requires_group_by = false
-            statement.group(group_by_columns) unless group_by_columns.empty?
-            @group_by_columns = []
-          end
+          return statement.project(select_maker.star(base_table)).to_sql if select_all
 
           statement.to_sql
         end
@@ -60,19 +36,47 @@ module Dbee
         private
 
         attr_reader :base_table,
+                    :key_paths_to_arel_columns,
+                    :from_model,
                     :statement,
-                    :model,
                     :table_alias_maker,
-                    :column_alias_maker,
                     :requires_group_by,
-                    :group_by_columns
+                    :group_by_columns,
+                    :schema,
+                    :select_all,
+                    :tables
+
+        def reset_query_state
+          @base_table = nil
+          @key_paths_to_arel_columns = {}
+          @from_model        = nil
+          @group_by_columns  = []
+          @requires_group_by = false
+          @select_all        = true
+          @tables            = {}
+        end
+
+        def build_query(query)
+          establish_query_base(query)
+          process_fields_sorters_and_filters(query)
+
+          add_partitioners(base_table, from_model.partitioners)
+          add_limit(query.limit)
+          add_offset(query.offset)
+
+          statement.group(group_by_columns) if requires_group_by && !group_by_columns.empty?
+        end
 
-        def tables
-          @tables ||= {}
+        def establish_query_base(query)
+          @from_model = schema.model_for_name!(query.from)
+          @base_table = make_table(from_model.table, @from_model.name)
+          build(base_table)
         end
 
-        def key_paths_to_arel_columns
-          @key_paths_to_arel_columns ||= {}
+        def process_fields_sorters_and_filters(query)
+          query.fields.each   { |field| add_field(field) }
+          query.sorters.each  { |sorter| add_sorter(sorter) }
+          query.filters.each  { |filter| add_filter(filter) }
         end
 
         def add_filter(filter)
@@ -80,7 +84,7 @@ module Dbee
 
           key_path    = filter.key_path
           arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = Where.instance.make(filter, arel_column)
+          predicate   = where_maker.make(filter, arel_column)
 
           build(statement.where(predicate))
 
@@ -92,7 +96,7 @@ module Dbee
 
           key_path    = sorter.key_path
           arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = Order.instance.make(sorter, arel_column)
+          predicate   = order_maker.make(sorter, arel_column)
 
           build(statement.order(predicate))
 
@@ -108,14 +112,14 @@ module Dbee
         end
 
         def add_field(field)
+          @select_all                 = false
           arel_value_column           = add_key_path(field.key_path)
           arel_key_columns_to_filters = add_filter_key_paths(field.filters)
 
-          predicate = Select.instance.make(
+          predicate = select_maker.make(
             field,
             arel_key_columns_to_filters,
-            arel_value_column,
-            column_alias_maker
+            arel_value_column
           )
 
           build(statement.project(predicate))
@@ -137,6 +141,14 @@ module Dbee
           self
         end
 
+        def add_offset(offset)
+          offset = offset ? offset.to_i : nil
+
+          build(statement.skip(offset))
+
+          self
+        end
+
         def add_partitioners(table, partitioners)
           partitioners.each do |partitioner|
             arel_column = table[partitioner.name]
@@ -148,33 +160,43 @@ module Dbee
           self
         end
 
-        def table(name, model, previous_table)
-          table = make_table(model.table, name)
+        def table(ancestor_names, relationship, model, previous_table)
+          table = make_table(model.table, ancestor_names)
 
-          on = Constraint.instance.make(model.constraints, table, previous_table)
+          on = constraint_maker.make(relationship.constraints, table, previous_table)
 
-          raise MissingConstraintError, "for: #{name}" unless on
+          raise MissingConstraintError, "for: #{ancestor_names}" unless on
 
           build(statement.join(table, ::Arel::Nodes::OuterJoin))
           build(statement.on(on))
 
           add_partitioners(table, model.partitioners)
 
-          tables[name] = table
+          tables[ancestor_names] = table
         end
 
-        def traverse_ancestors(ancestors)
-          ancestors.each_pair.inject(base_table) do |memo, (name, model)|
-            tables.key?(name) ? tables[name] : table(name, model, memo)
+        # Travel the query path returning the table at the end of the path.
+        #
+        # Side effect: intermediate tables are created along the way and are
+        # added to the "tables" hash keyed by path.
+        def traverse_query_path(expanded_query_path)
+          visited_path = []
+
+          expanded_query_path.inject(base_table) do |prev_model, (relationship, next_model)|
+            visited_path += [relationship.name]
+            if tables.key?(visited_path)
+              tables[visited_path]
+            else
+              table(visited_path, relationship, next_model, prev_model)
+            end
           end
         end
 
         def add_key_path(key_path)
           return key_paths_to_arel_columns[key_path] if key_paths_to_arel_columns.key?(key_path)
 
-          ancestors = model.ancestors!(key_path.ancestor_names)
-
-          table = traverse_ancestors(ancestors)
+          expanded_query_path = schema.expand_query_path(from_model, key_path)
+          table = traverse_query_path(expanded_query_path)
 
           arel_column = table[key_path.column_name]
 

data/lib/dbee/providers/active_record_provider/maker.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019-present, Blue Marble Payroll, LLC
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+require_relative 'makers/constraint'
+require_relative 'makers/order'
+require_relative 'makers/select'
+require_relative 'makers/where'
+
+module Dbee
+  module Providers
+    class ActiveRecordProvider
+      # This class composes all the maker instances into one for use together.
+      class Maker # :nodoc: all
+        def initialize(column_alias_maker)
+          @column_alias_maker = column_alias_maker
+          @constraint_maker   = Makers::Constraint.instance
+          @order_maker        = Makers::Order.instance
+          @select_maker       = Makers::Select.new(column_alias_maker)
+          @where_maker        = Makers::Where.instance
+        end
+
+        private
+
+        attr_reader :constraint_maker,
+                    :order_maker,
+                    :select_maker,
+                    :where_maker
+      end
+    end
+  end
+end

data/lib/dbee/providers/active_record_provider/{expression_builder → makers}/constraint.rb

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      class ExpressionBuilder
+      module Makers # :nodoc: all
         # Can derive constraints for Arel table JOIN statements.
         class Constraint
           include Singleton

data/lib/dbee/providers/active_record_provider/{expression_builder → makers}/order.rb

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      class ExpressionBuilder
+      module Makers # :nodoc: all
         # Derives Arel#order predicates.
         class Order
           include Singleton

data/lib/dbee/providers/active_record_provider/{expression_builder → makers}/select.rb

@@ -10,12 +10,22 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      class ExpressionBuilder
+      module Makers # :nodoc: all
         # Derives Arel#project predicates.
         class Select
-          include Singleton
+          attr_reader :alias_maker
 
-          def make(field, arel_key_nodes_to_filters, arel_value_node, alias_maker)
+          def initialize(alias_maker)
+            @alias_maker = alias_maker
+
+            freeze
+          end
+
+          def star(arel_table)
+            arel_table[Arel.star]
+          end
+
+          def make(field, arel_key_nodes_to_filters, arel_value_node)
             column_alias = quote(alias_maker.make(field.display))
             predicate    = expression(field, arel_key_nodes_to_filters, arel_value_node)
             predicate    = aggregate(field, predicate)

data/lib/dbee/providers/active_record_provider/{expression_builder → makers}/where.rb

@@ -10,20 +10,26 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      class ExpressionBuilder
+      module Makers # :nodoc: all
         # Derives Arel#where predicates.
         class Where
           include Singleton
 
           def make(filter, arel_column)
-            # If the filter has a value of nil, then simply return an IS NULL predicate
-            return make_is_null_predicate(arel_column) unless filter.value
+            # If the filter has a value of nil, then simply return an IS (NOT) NULL predicate
+            return make_is_null_predicate(arel_column, filter.class) if filter.value.nil?
 
             values = Array(filter.value).flatten
 
             # This logic helps ensure that if a null exists that it translates to an IS NULL
             # predicate and does not get put into an in or not_in clause.
-            predicates = values.include?(nil) ? [make_is_null_predicate(arel_column)] : []
+            predicates =
+              if values.include?(nil)
+                [make_is_null_predicate(arel_column, filter.class)]
+              else
+                []
+              end
+
             predicates += make_predicates(filter, arel_column, values - [nil])
 
             # Chain all predicates together
@@ -47,7 +53,20 @@ module Dbee
             Query::Filters::StartsWith => ->(node, val) { node.matches("#{val}%") }
           }.freeze
 
-          private_constant :FILTER_EVALUATORS
+          NULL_PREDICATE_MAP = {
+            Query::Filters::Contains => Query::Filters::Equals,
+            Query::Filters::Equals => Query::Filters::Equals,
+            Query::Filters::GreaterThan => Query::Filters::Equals,
+            Query::Filters::GreaterThanOrEqualTo => Query::Filters::Equals,
+            Query::Filters::LessThan => Query::Filters::Equals,
+            Query::Filters::LessThanOrEqualTo => Query::Filters::Equals,
+            Query::Filters::NotContain => Query::Filters::NotEquals,
+            Query::Filters::NotEquals => Query::Filters::NotEquals,
+            Query::Filters::NotStartWith => Query::Filters::NotEquals,
+            Query::Filters::StartsWith => Query::Filters::Equals
+          }.freeze
+
+          private_constant :FILTER_EVALUATORS, :NULL_PREDICATE_MAP
 
           def make_predicates(filter, arel_column, values)
             if use_in?(filter, values)
@@ -81,8 +100,9 @@ module Dbee
             method.call(arel_column, value)
           end
 
-          def make_is_null_predicate(arel_column)
-            make_predicate(arel_column, Query::Filters::Equals, nil)
+          def make_is_null_predicate(arel_column, requested_filter_class)
+            actual_filter_class = NULL_PREDICATE_MAP[requested_filter_class]
+            make_predicate(arel_column, actual_filter_class, nil)
           end
         end
       end

data/lib/dbee/providers/active_record_provider/version.rb

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      VERSION = '2.1.0-alpha.1'
+      VERSION = '2.3.0'
     end
   end
 end

data/lib/dbee/providers/active_record_provider.rb

@@ -35,12 +35,12 @@ module Dbee
         @column_alias_maker = alias_maker(column_prefix)
       end
 
-      def sql(model, query)
+      def sql(schema, query)
         ExpressionBuilder.new(
-          model,
+          schema,
           table_alias_maker,
           column_alias_maker
-        ).add(query).to_sql
+        ).to_sql(query)
       end
 
       private