dbee-active_record 2.0.4 → 2.1.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f50827b6f31ffb9749796b4532b8a48f704c522be4e0011b7e9a58ed716dd26
-  data.tar.gz: e9469a99514bfdfbe03da6cdcda339aef1b12b2d829a82d7e2278a22b006f0b3
+  metadata.gz: f8de8c388637ba455ffca406ff42751ecfb62f4a40bbcb9f560a085b585568a1
+  data.tar.gz: 9723886e37e886d7df7fa4661df4c81d35fe186d08a7d82de66083e08ed44bac
 SHA512:
-  metadata.gz: 7162ee879530dd36b2078a347b6fade9a5e5ce8e79f47709b33b11cb308303195cbafb3e6096a1529ddb7b7c23da6a19caccdc61356f29dd14b48b4e077cc041
-  data.tar.gz: 6d19989ed13fd0e2d7a88b3341309cf517aede0f4924c8f76f1325685a099b4b20985774adb445b0bb3487c9d91568500a86c767237618f57194e2806ee0fa93
+  metadata.gz: be75ae14b3c4b0154a0cc4f63950fa86a5f9f16272cd2d5133a4fc4649e2bcd6f7dc5836cf1706c7a9a6b9dba1f1183783038b013bc9e78f5cc5f25e9c980f78
+  data.tar.gz: 7f466202c164f0da7fb936010bc73393a0643682588f14093979fa1e8844f36bd0978020f3f435624d6bea25d95767af35884c6e453a35f41d219dd4331b22d7

data/.rubocop.yml

@@ -1,6 +1,20 @@
-Metrics/LineLength:
+AllCops:
+  TargetRubyVersion: 2.5
+
+Layout/LineLength:
   Max: 100
 
+Lint/RaiseException:
+  Enabled: True
+
+Lint/StructNewOverride:
+  Enabled: True
+
+Metrics/AbcSize:
+  Max: 16
+  Exclude:
+    - spec/db_helper.rb
+
 Metrics/BlockLength:
   ExcludedMethods:
     - let
@@ -13,18 +27,19 @@ Metrics/BlockLength:
     - spec/dbee/**/*
     - dbee-active_record.gemspec
 
+Metrics/ClassLength:
+  Max: 125
+
 Metrics/MethodLength:
   Max: 25
   Exclude:
     - spec/db_helper.rb
 
-AllCops:
-  TargetRubyVersion: 2.3
+Style/HashEachMethods:
+  Enabled: True
 
-Metrics/AbcSize:
-  Max: 16
-  Exclude:
-    - spec/db_helper.rb
+Style/HashTransformKeys:
+  Enabled: True
 
-Metrics/ClassLength:
-  Max: 125
+Style/HashTransformValues:
+  Enabled: True

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.6

data/.travis.yml

@@ -6,19 +6,12 @@ services:
   - mysql
 rvm:
   # Build on the latest stable of all supported Rubies (https://www.ruby-lang.org/en/downloads/):
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.5
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 env:
   - AR_VERSION=5
   - AR_VERSION=6
-matrix:
-  exclude:
-    - rvm: 2.3.8
-      env: AR_VERSION=6
-    - rvm: 2.4.6
-      env: AR_VERSION=6
 cache: bundler
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.1.0 (TBD)
+
+### Additions:
+
+* Implemented Dbee::Query::Field#aggregator
+* Implemented Dbee::Query::Field#filters
+
+### Changes:
+
+* Bumped minimum Ruby version to 2.5
+
 # 2.0.4 (February 13th, 2020)
 
 * use Arel#in for Equal filters when there is more than one value

data/dbee-active_record.gemspec

@@ -15,11 +15,19 @@ Gem::Specification.new do |s|
   s.email       = ['mruggio@bluemarblepayroll.com']
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  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.3.8'
+  s.required_ruby_version = '>= 2.5'
 
   ar_version = ENV['AR_VERSION'] || ''
 
@@ -34,15 +42,15 @@ Gem::Specification.new do |s|
     end
 
   s.add_dependency('activerecord', activerecord_version)
-  s.add_dependency('dbee', '~>2', '>=2.0.3')
+  s.add_dependency('dbee', '=2.1.0.pre.alpha')
 
   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('rake', '~> 13')
   s.add_development_dependency('rspec', '~> 3.8')
-  s.add_development_dependency('rubocop', '~>0.79.0')
+  s.add_development_dependency('rubocop', '~>0.81.0')
   s.add_development_dependency('simplecov', '~>0.17.0')
-  s.add_development_dependency('simplecov-console', '~>0.6.0')
+  s.add_development_dependency('simplecov-console', '~>0.7.0')
   s.add_development_dependency('sqlite3', '~>1')
 end

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

@@ -7,26 +7,24 @@
 # LICENSE file in the root directory of this source tree.
 #
 
-require_relative 'expression_builder/constraint_maker'
-require_relative 'expression_builder/order_maker'
-require_relative 'expression_builder/select_maker'
-require_relative 'expression_builder/where_maker'
+require_relative 'expression_builder/constraint'
+require_relative 'expression_builder/order'
+require_relative 'expression_builder/select'
+require_relative 'expression_builder/where'
 
 module Dbee
   module Providers
     class ActiveRecordProvider
       # This class can generate an Arel expression tree.
       class ExpressionBuilder
-        extend Forwardable
-
         class MissingConstraintError < StandardError; end
 
-        def_delegators :statement, :to_sql
-
         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   = []
 
           clear
         end
@@ -49,13 +47,25 @@ module Dbee
           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
+
+          statement.to_sql
+        end
+
         private
 
         attr_reader :base_table,
                     :statement,
                     :model,
                     :table_alias_maker,
-                    :column_alias_maker
+                    :column_alias_maker,
+                    :requires_group_by,
+                    :group_by_columns
 
         def tables
           @tables ||= {}
@@ -70,7 +80,7 @@ module Dbee
 
           key_path    = filter.key_path
           arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = WhereMaker.instance.make(filter, arel_column)
+          predicate   = Where.instance.make(filter, arel_column)
 
           build(statement.where(predicate))
 
@@ -82,22 +92,40 @@ module Dbee
 
           key_path    = sorter.key_path
           arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = OrderMaker.instance.make(sorter, arel_column)
+          predicate   = Order.instance.make(sorter, arel_column)
 
           build(statement.order(predicate))
 
           self
         end
 
+        def add_filter_key_paths(filters)
+          filters.each_with_object({}) do |filter, memo|
+            arel_key_column = add_key_path(filter.key_path)
+
+            memo[arel_key_column] = filter
+          end
+        end
+
         def add_field(field)
-          add_key_path(field.key_path)
+          arel_value_column           = add_key_path(field.key_path)
+          arel_key_columns_to_filters = add_filter_key_paths(field.filters)
 
-          key_path    = field.key_path
-          arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = SelectMaker.instance.make(field, arel_column, column_alias_maker)
+          predicate = Select.instance.make(
+            field,
+            arel_key_columns_to_filters,
+            arel_value_column,
+            column_alias_maker
+          )
 
           build(statement.project(predicate))
 
+          if field.aggregator?
+            @requires_group_by = true
+          else
+            group_by_columns << arel_value_column
+          end
+
           self
         end
 
@@ -123,7 +151,7 @@ module Dbee
         def table(name, model, previous_table)
           table = make_table(model.table, name)
 
-          on = ConstraintMaker.instance.make(model.constraints, table, previous_table)
+          on = Constraint.instance.make(model.constraints, table, previous_table)
 
           raise MissingConstraintError, "for: #{name}" unless on
 
@@ -142,16 +170,16 @@ module Dbee
         end
 
         def add_key_path(key_path)
-          return if key_paths_to_arel_columns.key?(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)
 
           arel_column = table[key_path.column_name]
-          key_paths_to_arel_columns[key_path] = arel_column
 
-          self
+          # Note that this returns arel_column
+          key_paths_to_arel_columns[key_path] = arel_column
         end
 
         def build(new_expression)

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

@@ -12,9 +12,19 @@ module Dbee
     class ActiveRecordProvider
       class ExpressionBuilder
         # Can derive constraints for Arel table JOIN statements.
-        class ConstraintMaker
+        class Constraint
           include Singleton
 
+          def make(constraints, table, previous_table)
+            constraints.inject(nil) do |memo, constraint|
+              method = CONSTRAINT_RESOLVERS[constraint.class]
+
+              raise ArgumentError, "constraint unhandled: #{constraint.class.name}" unless method
+
+              method.call(constraint, memo, table, previous_table)
+            end
+          end
+
           CONCAT_METHOD = lambda do |on, arel_column, value|
             on ? on.and(arel_column.eq(value)) : arel_column.eq(value)
           end
@@ -44,16 +54,6 @@ module Dbee
           }.freeze
 
           private_constant :CONSTRAINT_RESOLVERS
-
-          def make(constraints, table, previous_table)
-            constraints.inject(nil) do |memo, constraint|
-              method = CONSTRAINT_RESOLVERS[constraint.class]
-
-              raise ArgumentError, "constraint unhandled: #{constraint.class.name}" unless method
-
-              method.call(constraint, memo, table, previous_table)
-            end
-          end
         end
       end
     end

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

@@ -12,16 +12,9 @@ module Dbee
     class ActiveRecordProvider
       class ExpressionBuilder
         # Derives Arel#order predicates.
-        class OrderMaker
+        class Order
           include Singleton
 
-          SORTER_EVALUATORS = {
-            Query::Sorters::Ascending => ->(column) { column },
-            Query::Sorters::Descending => ->(column) { column.desc }
-          }.freeze
-
-          private_constant :SORTER_EVALUATORS
-
           def make(sorter, arel_column)
             method = SORTER_EVALUATORS[sorter.class]
 
@@ -29,6 +22,13 @@ module Dbee
 
             method.call(arel_column)
           end
+
+          SORTER_EVALUATORS = {
+            Query::Sorters::Ascending => ->(column) { column },
+            Query::Sorters::Descending => ->(column) { column.desc }
+          }.freeze
+
+          private_constant :SORTER_EVALUATORS
         end
       end
     end

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

@@ -0,0 +1,71 @@
+# 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.
+#
+
+module Dbee
+  module Providers
+    class ActiveRecordProvider
+      class ExpressionBuilder
+        # Derives Arel#project predicates.
+        class Select
+          include Singleton
+
+          def make(field, arel_key_nodes_to_filters, arel_value_node, alias_maker)
+            column_alias = quote(alias_maker.make(field.display))
+            predicate    = expression(field, arel_key_nodes_to_filters, arel_value_node)
+            predicate    = aggregate(field, predicate)
+
+            predicate.as(column_alias)
+          end
+
+          private
+
+          AGGREGRATOR_EVALUATORS = {
+            nil => ->(arel_node) { arel_node },
+            Query::Field::Aggregator::AVE => ->(node) { Arel::Nodes::Avg.new([node]) },
+            Query::Field::Aggregator::COUNT => ->(node) { Arel::Nodes::Count.new([node]) },
+            Query::Field::Aggregator::MAX => ->(node) { Arel::Nodes::Max.new([node]) },
+            Query::Field::Aggregator::MIN => ->(node) { Arel::Nodes::Min.new([node]) },
+            Query::Field::Aggregator::SUM => ->(node) { Arel::Nodes::Sum.new([node]) }
+          }.freeze
+
+          private_constant :AGGREGRATOR_EVALUATORS
+
+          def quote(value)
+            ActiveRecord::Base.connection.quote(value)
+          end
+
+          def aggregate(field, predicate)
+            AGGREGRATOR_EVALUATORS[field.aggregator].call(predicate)
+          end
+
+          def expression(field, arel_key_nodes_to_filters, arel_value_node)
+            if field.filters?
+              case_statement   = Arel::Nodes::Case.new
+              filter_predicate = make_filter_predicate(arel_key_nodes_to_filters)
+
+              case_statement.when(filter_predicate).then(arel_value_node)
+            else
+              arel_value_node
+            end
+          end
+
+          def make_filter_predicate(arel_key_nodes_to_filters)
+            predicates = arel_key_nodes_to_filters.map do |arel_key_node, filter|
+              Where.instance.make(filter, arel_key_node)
+            end
+
+            predicates.inject(predicates.shift) do |memo, predicate|
+              memo.and(predicate)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,24 +12,9 @@ module Dbee
     class ActiveRecordProvider
       class ExpressionBuilder
         # Derives Arel#where predicates.
-        class WhereMaker
+        class Where
           include Singleton
 
-          FILTER_EVALUATORS = {
-            Query::Filters::Contains => ->(column, val) { column.matches("%#{val}%") },
-            Query::Filters::Equals => ->(column, val) { column.eq(val) },
-            Query::Filters::GreaterThan => ->(column, val) { column.gt(val) },
-            Query::Filters::GreaterThanOrEqualTo => ->(column, val) { column.gteq(val) },
-            Query::Filters::LessThan => ->(column, val) { column.lt(val) },
-            Query::Filters::LessThanOrEqualTo => ->(column, val) { column.lteq(val) },
-            Query::Filters::NotContain => ->(column, val) { column.does_not_match("%#{val}%") },
-            Query::Filters::NotEquals => ->(column, val) { column.not_eq(val) },
-            Query::Filters::NotStartWith => ->(column, val) { column.does_not_match("#{val}%") },
-            Query::Filters::StartsWith => ->(column, val) { column.matches("#{val}%") }
-          }.freeze
-
-          private_constant :FILTER_EVALUATORS
-
           def make(filter, arel_column)
             values = normalize(filter.value)
 
@@ -44,6 +29,21 @@ module Dbee
 
           private
 
+          FILTER_EVALUATORS = {
+            Query::Filters::Contains => ->(node, val) { node.matches("%#{val}%") },
+            Query::Filters::Equals => ->(node, val) { node.eq(val) },
+            Query::Filters::GreaterThan => ->(node, val) { node.gt(val) },
+            Query::Filters::GreaterThanOrEqualTo => ->(node, val) { node.gteq(val) },
+            Query::Filters::LessThan => ->(node, val) { node.lt(val) },
+            Query::Filters::LessThanOrEqualTo => ->(node, val) { node.lteq(val) },
+            Query::Filters::NotContain => ->(node, val) { node.does_not_match("%#{val}%") },
+            Query::Filters::NotEquals => ->(node, val) { node.not_eq(val) },
+            Query::Filters::NotStartWith => ->(node, val) { node.does_not_match("#{val}%") },
+            Query::Filters::StartsWith => ->(node, val) { node.matches("#{val}%") }
+          }.freeze
+
+          private_constant :FILTER_EVALUATORS
+
           def normalize(value)
             value ? Array(value).flatten : [nil]
           end

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

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

data/spec/db_helper.rb

@@ -10,6 +10,27 @@
 # Enable logging using something like:
 # ActiveRecord::Base.logger = Logger.new(STDERR)
 
+class Field < ActiveRecord::Base
+  has_many :patient_field_values
+end
+
+class Patient < ActiveRecord::Base
+  has_many :patient_field_values
+  has_many :patient_payments
+
+  accepts_nested_attributes_for :patient_field_values
+  accepts_nested_attributes_for :patient_payments
+end
+
+class PatientFieldValue < ActiveRecord::Base
+  belongs_to :patient
+  belongs_to :field
+end
+
+class PatientPayment < ActiveRecord::Base
+  belongs_to :patient
+end
+
 def connect_to_db(name)
   config = yaml_file_read('spec', 'config', 'database.yaml')[name.to_s]
   ActiveRecord::Base.establish_connection(config)
@@ -17,39 +38,40 @@ end
 
 def load_schema
   ActiveRecord::Schema.define do
+    # Movie Theater Schema
     create_table :theaters do |t|
-      t.column :name, :string
+      t.column :name,      :string
       t.column :partition, :string
-      t.column :active, :boolean
+      t.column :active,    :boolean
       t.column :inspected, :boolean
       t.timestamps
     end
 
     create_table :members do |t|
-      t.column :tid, :integer
+      t.column :tid,            :integer
       t.column :account_number, :string
-      t.column :partition, :string
+      t.column :partition,      :string
       t.timestamps
     end
 
     create_table :demographics do |t|
       t.column :member_id, :integer
-      t.column :name, :string
+      t.column :name,      :string
       t.timestamps
     end
 
     create_table :phone_numbers do |t|
       t.column :demographic_id, :integer
-      t.column :phone_type, :string
-      t.column :phone_number, :string
+      t.column :phone_type,     :string
+      t.column :phone_number,   :string
       t.timestamps
     end
 
     create_table :movies do |t|
       t.column :member_id, :integer
-      t.column :name, :string
-      t.column :genre, :string
-      t.column :favorite, :boolean, default: false, null: false
+      t.column :name,      :string
+      t.column :genre,     :string
+      t.column :favorite,  :boolean, default: false, null: false
       t.timestamps
     end
 
@@ -60,10 +82,10 @@ def load_schema
 
     create_table :animals do |t|
       t.column :owner_id, :integer
-      t.column :toy_id, :integer
-      t.column :type, :string
-      t.column :name, :string
-      t.column :deleted, :boolean
+      t.column :toy_id,   :integer
+      t.column :type,     :string
+      t.column :name,     :string
+      t.column :deleted,  :boolean
       t.timestamps
     end
 
@@ -76,5 +98,99 @@ def load_schema
       t.column :laser, :boolean
       t.timestamps
     end
+
+    # Patient Schema
+    create_table :fields do |t|
+      t.column :section, :string
+      t.column :key,     :string
+      t.timestamps
+    end
+
+    create_table :patients do |t|
+      t.column :first,  :string
+      t.column :middle, :string
+      t.column :last,   :string
+      t.timestamps
+    end
+
+    create_table :patient_field_values do |t|
+      t.column :patient_id, :integer
+      t.column :field_id,   :integer
+      t.column :value,      :string
+      t.timestamps
+    end
+
+    create_table :patient_payments do |t|
+      t.column :patient_id, :integer
+      t.column :amount,     :decimal
+      t.timestamps
+    end
   end
 end
+
+def load_data
+  demo_dob_field              = Field.create!(section: 'demographics', key: 'dob')
+  demo_drivers_license_field  = Field.create!(section: 'demographics', key: 'drivers_license')
+  demo_notes_field            = Field.create!(section: 'demographics', key: 'notes')
+
+  contact_phone_number_field  = Field.create!(section: 'contact', key: 'phone_number')
+  contact_notes_field         = Field.create!(section: 'contact', key: 'notes')
+
+  Patient.create!(
+    first: 'Bozo',
+    middle: 'The',
+    last: 'Clown',
+    patient_field_values_attributes: [
+      {
+        field: demo_dob_field,
+        value: '1904-04-04'
+      },
+      {
+        field: demo_notes_field,
+        value: 'The patient is funny!'
+      },
+      {
+        field: demo_drivers_license_field,
+        value: '82-54-hut-hut-hike!'
+      },
+      {
+        field: contact_phone_number_field,
+        value: '555-555-5555'
+      },
+      {
+        field: contact_notes_field,
+        value: 'Do not call this patient at night!'
+      }
+    ],
+    patient_payments_attributes: [
+      { amount: 5 },
+      { amount: 10 },
+      { amount: 15 }
+    ]
+  )
+
+  Patient.create!(
+    first: 'Frank',
+    last: 'Rizzo',
+    patient_payments_attributes: [
+      { amount: 50 },
+      { amount: 150 }
+    ]
+  )
+
+  Patient.create!(
+    first: 'Bugs',
+    middle: 'The',
+    last: 'Bunny',
+    patient_field_values_attributes: [
+      {
+        field: demo_dob_field,
+        value: '2040-01-01'
+      },
+      {
+        field: contact_notes_field,
+        value: 'Call anytime!!'
+      }
+    ]
+  )
+end

data/spec/dbee/providers/active_record_provider_spec.rb

@@ -79,7 +79,7 @@ describe Dbee::Providers::ActiveRecordProvider do
       end
     end
 
-    context 'Executing SQL' do
+    context 'Shallow SQL Execution' do
       %w[sqlite].each do |dbms|
         context dbms do
           before(:all) do
@@ -108,4 +108,105 @@ describe Dbee::Providers::ActiveRecordProvider do
       end
     end
   end
+
+  describe 'Deep SQL execution' do
+    before(:all) do
+      connect_to_db(:sqlite)
+      load_schema
+      load_data
+    end
+
+    describe 'pivoting' do
+      let(:snapshot_path) do
+        %w[
+          spec
+          fixtures
+          active_record_snapshots
+          two_table_query_with_pivoting.yaml
+        ]
+      end
+
+      let(:snapshot) { yaml_file_read(*snapshot_path) }
+      let(:query)    { Dbee::Query.make(snapshot['query']) }
+      let(:model)    { Dbee::Model.make(models['Patients']) }
+
+      it 'pivots table rows into columns' do
+        sql = described_class.new.sql(model, query)
+
+        results = ActiveRecord::Base.connection.execute(sql)
+
+        expect(results[0]).to include(
+          'First Name' => 'Bozo',
+          'Date of Birth' => '1904-04-04',
+          'Drivers License #' => '82-54-hut-hut-hike!',
+          'Demographic Notes' => 'The patient is funny!',
+          'Contact Notes' => 'Do not call this patient at night!'
+        )
+
+        expect(results[1]).to include(
+          'First Name' => 'Frank',
+          'Date of Birth' => nil,
+          'Drivers License #' => nil,
+          'Demographic Notes' => nil,
+          'Contact Notes' => nil
+        )
+
+        expect(results[2]).to include(
+          'First Name' => 'Bugs',
+          'Date of Birth' => '2040-01-01',
+          'Drivers License #' => nil,
+          'Demographic Notes' => nil,
+          'Contact Notes' => 'Call anytime!!'
+        )
+      end
+    end
+
+    describe 'aggregation' do
+      let(:snapshot_path) do
+        %w[
+          spec
+          fixtures
+          active_record_snapshots
+          two_table_query_with_aggregation.yaml
+        ]
+      end
+
+      let(:snapshot) { yaml_file_read(*snapshot_path) }
+      let(:query)    { Dbee::Query.make(snapshot['query']) }
+      let(:model)    { Dbee::Model.make(models['Patients']) }
+
+      it 'executes correct SQL aggregate functions' do
+        sql = described_class.new.sql(model, query)
+
+        results = ActiveRecord::Base.connection.execute(sql)
+
+        expect(results[0]).to include(
+          'First Name' => 'Bozo',
+          'Ave Payment' => 10,
+          'Number of Payments' => 3,
+          'Max Payment' => 15,
+          'Min Payment' => 5,
+          'Total Paid' => 30
+        )
+
+        expect(results[1]).to include(
+          'First Name' => 'Frank',
+          'Ave Payment' => 100,
+          'Number of Payments' => 2,
+          'Max Payment' => 150,
+          'Min Payment' => 50,
+          'Total Paid' => 200
+        )
+
+        expect(results[2]).to include(
+          'First Name' => 'Bugs',
+          'Ave Payment' => nil,
+          'Number of Payments' => 0,
+          'Max Payment' => nil,
+          'Min Payment' => nil,
+          'Total Paid' => nil
+        )
+      end
+    end
+  end
 end

data/spec/fixtures/active_record_snapshots/two_table_query_with_aggregation.yaml

@@ -0,0 +1,71 @@
+model_name: Patients
+query:
+  fields:
+    - key_path: id
+      display: 'ID #'
+    - key_path: first
+      display: First Name
+    - key_path: patient_payments.amount
+      display: Ave Payment
+      aggregator: ave
+    - key_path: patient_payments.amount
+      display: Number of Payments
+      aggregator: count
+    - key_path: patient_payments.amount
+      display: Max Payment
+      aggregator: max
+    - key_path: patient_payments.amount
+      display: Min Payment
+      aggregator: min
+    - key_path: patient_payments.amount
+      display: Total Paid
+      aggregator: sum
+
+sqlite_readable: |+
+  SELECT
+   "patients"."id" AS 'ID #',
+   "patients"."first" AS 'First Name',
+   AVG("patient_payments"."amount") AS 'Ave Payment',
+   COUNT("patient_payments"."amount") AS 'Number of Payments',
+   MAX("patient_payments"."amount") AS 'Max Payment',
+   MIN("patient_payments"."amount") AS 'Min Payment',
+   SUM("patient_payments"."amount") AS 'Total Paid'
+   FROM "patients" "patients"
+   LEFT OUTER JOIN "patient_payments" "patient_payments" ON "patient_payments"."patient_id" = "patients"."id"
+   GROUP BY "patients"."id", "patients"."first"
+sqlite_not_readable: |+
+  SELECT
+   "t0"."id" AS 'c0',
+  "t0"."first" AS 'c1',
+  AVG("t1"."amount") AS 'c2',
+  COUNT("t1"."amount") AS 'c3',
+  MAX("t1"."amount") AS 'c4',
+  MIN("t1"."amount") AS 'c5',
+  SUM("t1"."amount") AS 'c6'
+  FROM "patients" "t0"
+  LEFT OUTER JOIN "patient_payments" "t1" ON "t1"."patient_id" = "t0"."id"
+  GROUP BY "t0"."id", "t0"."first"
+mysql_readable: |+
+  SELECT
+   `patients`.`id` AS 'ID #',
+  `patients`.`first` AS 'First Name',
+  AVG(`patient_payments`.`amount`) AS 'Ave Payment',
+  COUNT(`patient_payments`.`amount`) AS 'Number of Payments',
+  MAX(`patient_payments`.`amount`) AS 'Max Payment',
+  MIN(`patient_payments`.`amount`) AS 'Min Payment',
+  SUM(`patient_payments`.`amount`) AS 'Total Paid'
+  FROM `patients` `patients`
+  LEFT OUTER JOIN `patient_payments` `patient_payments` ON `patient_payments`.`patient_id` = `patients`.`id`
+  GROUP BY `patients`.`id`, `patients`.`first`
+mysql_not_readable: |+
+  SELECT
+   `t0`.`id` AS 'c0',
+  `t0`.`first` AS 'c1',
+  AVG(`t1`.`amount`) AS 'c2',
+  COUNT(`t1`.`amount`) AS 'c3',
+  MAX(`t1`.`amount`) AS 'c4',
+  MIN(`t1`.`amount`) AS 'c5',
+  SUM(`t1`.`amount`) AS 'c6'
+  FROM `patients` `t0`
+  LEFT OUTER JOIN `patient_payments` `t1` ON `t1`.`patient_id` = `t0`.`id`
+  GROUP BY `t0`.`id`, `t0`.`first`

data/spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml

@@ -0,0 +1,88 @@
+model_name: Patients
+query:
+  fields:
+    - key_path: id
+      display: 'ID #'
+    - key_path: first
+      display: First Name
+    - key_path: patient_field_values.value
+      display: Date of Birth
+      aggregator: max
+      filters:
+        - key_path: patient_field_values.fields.section
+          value: demographics
+        - key_path: patient_field_values.fields.key
+          value: dob
+    - key_path: patient_field_values.value
+      display: Demographic Notes
+      aggregator: max
+      filters:
+        - key_path: patient_field_values.fields.section
+          value: demographics
+        - key_path: patient_field_values.fields.key
+          value: notes
+    - key_path: patient_field_values.value
+      display: 'Drivers License #'
+      aggregator: max
+      filters:
+        - key_path: patient_field_values.fields.section
+          value: demographics
+        - key_path: patient_field_values.fields.key
+          value: drivers_license
+    - key_path: patient_field_values.value
+      display: Contact Notes
+      aggregator: max
+      filters:
+        - key_path: patient_field_values.fields.section
+          value: contact
+        - key_path: patient_field_values.fields.key
+          value: notes
+
+sqlite_readable: |+
+  SELECT
+   "patients"."id" AS 'ID #',
+  "patients"."first" AS 'First Name',
+  MAX(CASE WHEN "patient_field_values_fields"."section" = 'demographics' AND "patient_field_values_fields"."key" = 'dob' THEN "patient_field_values"."value" END) AS 'Date of Birth',
+  MAX(CASE WHEN "patient_field_values_fields"."section" = 'demographics' AND "patient_field_values_fields"."key" = 'notes' THEN "patient_field_values"."value" END) AS 'Demographic Notes',
+  MAX(CASE WHEN "patient_field_values_fields"."section" = 'demographics' AND "patient_field_values_fields"."key" = 'drivers_license' THEN "patient_field_values"."value" END) AS 'Drivers License #',
+  MAX(CASE WHEN "patient_field_values_fields"."section" = 'contact' AND "patient_field_values_fields"."key" = 'notes' THEN "patient_field_values"."value" END) AS 'Contact Notes'
+  FROM "patients" "patients"
+  LEFT OUTER JOIN "patient_field_values" "patient_field_values" ON "patient_field_values"."patient_id" = "patients"."id"
+  LEFT OUTER JOIN "fields" "patient_field_values_fields" ON "patient_field_values_fields"."id" = "patient_field_values"."field_id"
+  GROUP BY "patients"."id", "patients"."first"
+sqlite_not_readable: |+
+  SELECT
+   "t0"."id" AS 'c0',
+  "t0"."first" AS 'c1',
+  MAX(CASE WHEN "t2"."section" = 'demographics' AND "t2"."key" = 'dob' THEN "t1"."value" END) AS 'c2',
+  MAX(CASE WHEN "t2"."section" = 'demographics' AND "t2"."key" = 'notes' THEN "t1"."value" END) AS 'c3',
+  MAX(CASE WHEN "t2"."section" = 'demographics' AND "t2"."key" = 'drivers_license' THEN "t1"."value" END) AS 'c4',
+  MAX(CASE WHEN "t2"."section" = 'contact' AND "t2"."key" = 'notes' THEN "t1"."value" END) AS 'c5'
+  FROM "patients" "t0"
+  LEFT OUTER JOIN "patient_field_values" "t1" ON "t1"."patient_id" = "t0"."id"
+  LEFT OUTER JOIN "fields" "t2" ON "t2"."id" = "t1"."field_id"
+  GROUP BY "t0"."id", "t0"."first"
+mysql_readable: |+
+  SELECT
+   `patients`.`id` AS 'ID #',
+  `patients`.`first` AS 'First Name',
+  MAX(CASE WHEN `patient_field_values_fields`.`section` = 'demographics' AND `patient_field_values_fields`.`key` = 'dob' THEN `patient_field_values`.`value` END) AS 'Date of Birth',
+  MAX(CASE WHEN `patient_field_values_fields`.`section` = 'demographics' AND `patient_field_values_fields`.`key` = 'notes' THEN `patient_field_values`.`value` END) AS 'Demographic Notes',
+  MAX(CASE WHEN `patient_field_values_fields`.`section` = 'demographics' AND `patient_field_values_fields`.`key` = 'drivers_license' THEN `patient_field_values`.`value` END) AS 'Drivers License #',
+  MAX(CASE WHEN `patient_field_values_fields`.`section` = 'contact' AND `patient_field_values_fields`.`key` = 'notes' THEN `patient_field_values`.`value` END) AS 'Contact Notes'
+  FROM `patients` `patients`
+  LEFT OUTER JOIN `patient_field_values` `patient_field_values` ON `patient_field_values`.`patient_id` = `patients`.`id`
+  LEFT OUTER JOIN `fields` `patient_field_values_fields` ON `patient_field_values_fields`.`id` = `patient_field_values`.`field_id`
+  GROUP BY `patients`.`id`, `patients`.`first`
+mysql_not_readable: |+
+  SELECT
+   `t0`.`id` AS 'c0',
+  `t0`.`first` AS 'c1',
+  MAX(CASE WHEN `t2`.`section` = 'demographics' AND `t2`.`key` = 'dob' THEN `t1`.`value` END) AS 'c2',
+  MAX(CASE WHEN `t2`.`section` = 'demographics' AND `t2`.`key` = 'notes' THEN `t1`.`value` END) AS 'c3',
+  MAX(CASE WHEN `t2`.`section` = 'demographics' AND `t2`.`key` = 'drivers_license' THEN `t1`.`value` END) AS 'c4',
+  MAX(CASE WHEN `t2`.`section` = 'contact' AND `t2`.`key` = 'notes' THEN `t1`.`value` END) AS 'c5'
+  FROM `patients` `t0`
+  LEFT OUTER JOIN `patient_field_values` `t1` ON `t1`.`patient_id` = `t0`.`id`
+  LEFT OUTER JOIN `fields` `t2` ON `t2`.`id` = `t1`.`field_id`
+  GROUP BY `t0`.`id`, `t0`.`first`

data/spec/fixtures/models.yaml

@@ -103,3 +103,23 @@ Partitioner Example 2:
           value: Dog
         - name: deleted
           value: false
+
+Patients:
+  name: patients
+  models:
+    - name: patient_payments
+      constraints:
+        - type: reference
+          parent: id
+          name: patient_id
+    - name: patient_field_values
+      constraints:
+        - type: reference
+          parent: id
+          name: patient_id
+      models:
+        - name: fields
+          constraints:
+            - type: reference
+              parent: field_id
+              name: id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0.pre.alpha
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -34,22 +34,16 @@ dependencies:
   name: dbee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0.pre.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0.pre.alpha
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -180,8 +174,7 @@ description: "    By default Dbee ships with no underlying SQL generator.  This
   will plug in ActiveRecord into Dbee and Dbee will use it for SQL generation.\n"
 email:
 - mruggio@bluemarblepayroll.com
-executables:
-- console
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -199,12 +192,13 @@ files:
 - Rakefile
 - bin/console
 - dbee-active_record.gemspec
+- exe/.gitkeep
 - lib/dbee/providers/active_record_provider.rb
 - lib/dbee/providers/active_record_provider/expression_builder.rb
-- lib/dbee/providers/active_record_provider/expression_builder/constraint_maker.rb
-- lib/dbee/providers/active_record_provider/expression_builder/order_maker.rb
-- lib/dbee/providers/active_record_provider/expression_builder/select_maker.rb
-- lib/dbee/providers/active_record_provider/expression_builder/where_maker.rb
+- lib/dbee/providers/active_record_provider/expression_builder/constraint.rb
+- lib/dbee/providers/active_record_provider/expression_builder/order.rb
+- lib/dbee/providers/active_record_provider/expression_builder/select.rb
+- lib/dbee/providers/active_record_provider/expression_builder/where.rb
 - lib/dbee/providers/active_record_provider/obfuscated_alias_maker.rb
 - lib/dbee/providers/active_record_provider/safe_alias_maker.rb
 - lib/dbee/providers/active_record_provider/version.rb
@@ -223,12 +217,19 @@ files:
 - spec/fixtures/active_record_snapshots/partitioner_example_2_query.yaml
 - spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml
 - spec/fixtures/active_record_snapshots/two_table_query.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_aggregation.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb
 homepage: https://github.com/bluemarblepayroll/dbee-active_record
 licenses:
 - MIT
-metadata: {}
+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: https://github.com/bluemarblepayroll/dbee-active_record
+  source_code_uri: https://github.com/bluemarblepayroll/dbee-active_record
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -237,12 +238,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -264,5 +265,7 @@ test_files:
 - spec/fixtures/active_record_snapshots/partitioner_example_2_query.yaml
 - spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml
 - spec/fixtures/active_record_snapshots/two_table_query.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_aggregation.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb

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

@@ -1,33 +0,0 @@
-# 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.
-#
-
-module Dbee
-  module Providers
-    class ActiveRecordProvider
-      class ExpressionBuilder
-        # Derives Arel#project predicates.
-        class SelectMaker
-          include Singleton
-
-          def make(column, arel_column, alias_maker)
-            column_alias = quote(alias_maker.make(column.display))
-
-            arel_column.as(column_alias)
-          end
-
-          private
-
-          def quote(value)
-            ActiveRecord::Base.connection.quote(value)
-          end
-        end
-      end
-    end
-  end
-end