dbee-active_record 2.0.3 → 2.1.2

data/spec/dbee/providers/active_record_provider_spec.rb

@@ -11,8 +11,6 @@ require 'spec_helper'
 require 'db_helper'
 
 describe Dbee::Providers::ActiveRecordProvider do
-  let(:models) { yaml_fixture('models.yaml') }
-
   describe '#sql' do
     before(:all) do
       connect_to_db(:sqlite)
@@ -79,7 +77,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 +106,104 @@ 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/one_table_empty_query.yaml

@@ -0,0 +1,10 @@
+model_name: Patients
+query:
+sqlite_readable: |+
+  SELECT "patients".* FROM "patients" "patients"
+sqlite_not_readable: |+
+  SELECT "t0".* FROM "patients" "t0"
+mysql_readable: |+
+  SELECT `patients`.* FROM `patients` `patients`
+mysql_not_readable: |+
+  SELECT `t0`.* FROM `patients` `t0`

data/spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml

@@ -45,6 +45,10 @@ query:
         - 'Netflix'
         - 'Hulu'
       key_path: name
+    - type: not_equals
+      value:
+        - 'YouTube Super Video'
+      key_path: name
     - type: not_contain
       value:
         - 'tfli'
@@ -59,67 +63,71 @@ sqlite_readable: |+
   SELECT "theaters"."id" AS 'ID #',
   "theaters"."name" AS 'name'
   FROM "theaters" "theaters"
-  WHERE ("theaters"."name" = 'AMC' OR "theaters"."name" = 'Regal') AND
+  WHERE "theaters"."name" IN ('AMC', 'Regal') AND
   "theaters"."name" LIKE 'A%' AND
   "theaters"."name" LIKE '%m%' AND
   "theaters"."active" = 'false' AND
-  (("theaters"."active" = 't' OR "theaters"."active" = 'f') OR "theaters"."active" IS NULL) AND
-  (("theaters"."inspected" = 'f' OR "theaters"."inspected" = 't') OR "theaters"."inspected" IS NULL) AND
+  ("theaters"."active" IS NULL OR "theaters"."active" IN ('t', 'f')) AND
+  ("theaters"."inspected" IS NULL OR "theaters"."inspected" IN ('f', 't')) AND
   "theaters"."created_at" <= '2019-03-04' AND
   "theaters"."created_at" < '2018-03-04' AND
   "theaters"."created_at" >= '2001-03-04' AND
   "theaters"."created_at" > '2002-03-04' AND
-  ("theaters"."name" != 'Netflix' OR "theaters"."name" != 'Hulu') AND
+  "theaters"."name" NOT IN ('Netflix', 'Hulu') AND
+  "theaters"."name" != 'YouTube Super Video' AND
   ("theaters"."name" NOT LIKE '%tfli%' OR "theaters"."name" NOT LIKE '%ul%') AND
   ("theaters"."name" NOT LIKE 'netf%' OR "theaters"."name" NOT LIKE 'hu%')
 sqlite_not_readable: |+
   SELECT "t0"."id" AS 'c0',
   "t0"."name" AS 'c1'
   FROM "theaters" "t0"
-  WHERE ("t0"."name" = 'AMC' OR "t0"."name" = 'Regal') AND
+  WHERE "t0"."name" IN ('AMC', 'Regal') AND
   "t0"."name" LIKE 'A%' AND
   "t0"."name" LIKE '%m%' AND
   "t0"."active" = 'false' AND
-  (("t0"."active" = 't' OR "t0"."active" = 'f') OR "t0"."active" IS NULL) AND
-  (("t0"."inspected" = 'f' OR "t0"."inspected" = 't') OR "t0"."inspected" IS NULL) AND
+  ("t0"."active" IS NULL OR "t0"."active" IN ('t', 'f')) AND
+  ("t0"."inspected" IS NULL OR "t0"."inspected" IN ('f', 't')) AND
   "t0"."created_at" <= '2019-03-04' AND
   "t0"."created_at" < '2018-03-04' AND
   "t0"."created_at" >= '2001-03-04' AND
   "t0"."created_at" > '2002-03-04' AND
-  ("t0"."name" != 'Netflix' OR "t0"."name" != 'Hulu') AND
+  "t0"."name" NOT IN ('Netflix', 'Hulu') AND
+  "t0"."name" != 'YouTube Super Video' AND
   ("t0"."name" NOT LIKE '%tfli%' OR "t0"."name" NOT LIKE '%ul%') AND
   ("t0"."name" NOT LIKE 'netf%' OR "t0"."name" NOT LIKE 'hu%')
 mysql_readable: |+
   SELECT `theaters`.`id` AS 'ID #',
   `theaters`.`name` AS 'name'
   FROM `theaters` `theaters`
-  WHERE (`theaters`.`name` = 'AMC' OR `theaters`.`name` = 'Regal') AND
+  WHERE `theaters`.`name` IN ('AMC', 'Regal') AND
   `theaters`.`name` LIKE 'A%' AND
   `theaters`.`name` LIKE '%m%' AND
   `theaters`.`active` = 'false' AND
-  ((`theaters`.`active` = TRUE OR `theaters`.`active` = FALSE) OR `theaters`.`active` IS NULL) AND
-  ((`theaters`.`inspected` = FALSE OR `theaters`.`inspected` = TRUE) OR `theaters`.`inspected` IS NULL) AND
+  (`theaters`.`active` IS NULL OR `theaters`.`active` IN (TRUE, FALSE)) AND
+  (`theaters`.`inspected` IS NULL OR `theaters`.`inspected` IN (FALSE, TRUE)) AND
   `theaters`.`created_at` <= '2019-03-04' AND
   `theaters`.`created_at` < '2018-03-04' AND
   `theaters`.`created_at` >= '2001-03-04' AND
   `theaters`.`created_at` > '2002-03-04' AND
-  (`theaters`.`name` != 'Netflix' OR `theaters`.`name` != 'Hulu') AND
+  `theaters`.`name` NOT IN ('Netflix', 'Hulu') AND
+  `theaters`.`name` != 'YouTube Super Video' AND
   (`theaters`.`name` NOT LIKE '%tfli%' OR `theaters`.`name` NOT LIKE '%ul%') AND
   (`theaters`.`name` NOT LIKE 'netf%' OR `theaters`.`name` NOT LIKE 'hu%')
 mysql_not_readable: |+
   SELECT `t0`.`id` AS 'c0',
   `t0`.`name` AS 'c1'
   FROM `theaters` `t0`
-  WHERE (`t0`.`name` = 'AMC' OR `t0`.`name` = 'Regal') AND
+  WHERE `t0`.`name` IN ('AMC', 'Regal') AND
   `t0`.`name` LIKE 'A%' AND
   `t0`.`name` LIKE '%m%' AND
   `t0`.`active` = 'false' AND
-  ((`t0`.`active` = TRUE OR `t0`.`active` = FALSE) OR `t0`.`active` IS NULL) AND
-  ((`t0`.`inspected` = FALSE OR `t0`.`inspected` = TRUE) OR `t0`.`inspected` IS NULL) AND
+  (`t0`.`active` IS NULL OR `t0`.`active` IN (TRUE, FALSE)) AND
+  (`t0`.`inspected` IS NULL OR `t0`.`inspected` IN (FALSE, TRUE)) AND
   `t0`.`created_at` <= '2019-03-04' AND
   `t0`.`created_at` < '2018-03-04' AND
   `t0`.`created_at` >= '2001-03-04' AND
   `t0`.`created_at` > '2002-03-04' AND
-  (`t0`.`name` != 'Netflix' OR `t0`.`name` != 'Hulu') AND
+  `t0`.`name` NOT IN ('Netflix', 'Hulu') AND
+  `t0`.`name` != 'YouTube Super Video' AND
   (`t0`.`name` NOT LIKE '%tfli%' OR `t0`.`name` NOT LIKE '%ul%') AND
   (`t0`.`name` NOT LIKE 'netf%' OR `t0`.`name` NOT LIKE 'hu%')

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

data/spec/spec_helper.rb

@@ -35,7 +35,7 @@ def fixture(*filename)
 end
 
 def yaml_fixture_files(*directory)
-  Dir[File.join('spec', 'fixtures', *directory, '*.yaml')].map do |filename|
+  Dir[File.join('spec', 'fixtures', *directory, '**', '*.yaml')].map do |filename|
     [
       filename,
       yaml_file_read(filename)
@@ -50,3 +50,7 @@ end
 def file_read(*filename)
   File.open(File.join(*filename), 'r:bom|utf-8').read
 end
+
+def models
+  yaml_fixture('models.yaml')
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.2
 platform: ruby
 authors:
 - Matthew Ruggio
+- Craig Kattner
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +40,7 @@ dependencies:
         version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +50,7 @@ dependencies:
         version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +93,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,42 +141,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     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 +195,8 @@ 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
+- ckattner@bluemarblepayroll.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -199,20 +214,25 @@ 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/maker.rb
+- lib/dbee/providers/active_record_provider/makers/constraint.rb
+- lib/dbee/providers/active_record_provider/makers/order.rb
+- lib/dbee/providers/active_record_provider/makers/select.rb
+- lib/dbee/providers/active_record_provider/makers/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
 - spec/config/database.yaml.ci
 - spec/db_helper.rb
+- spec/dbee/providers/active_record_provider/expression_builder_spec.rb
+- spec/dbee/providers/active_record_provider/makers/where_spec.rb
 - spec/dbee/providers/active_record_provider_spec.rb
 - spec/fixtures/active_record_snapshots/five_table_query.yaml
 - spec/fixtures/active_record_snapshots/multiple_same_table_query_with_static_constraints.yaml
+- spec/fixtures/active_record_snapshots/one_table_empty_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_ascending_sort.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_descending_sort.yaml
@@ -223,12 +243,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,7 +264,7 @@ 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:
   - - ">="
@@ -251,9 +278,12 @@ summary: Plugs in ActiveRecord so Dbee can use Arel for SQL generation.
 test_files:
 - spec/config/database.yaml.ci
 - spec/db_helper.rb
+- spec/dbee/providers/active_record_provider/expression_builder_spec.rb
+- spec/dbee/providers/active_record_provider/makers/where_spec.rb
 - spec/dbee/providers/active_record_provider_spec.rb
 - spec/fixtures/active_record_snapshots/five_table_query.yaml
 - spec/fixtures/active_record_snapshots/multiple_same_table_query_with_static_constraints.yaml
+- spec/fixtures/active_record_snapshots/one_table_empty_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_ascending_sort.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_descending_sort.yaml
@@ -264,5 +294,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