dbee-active_record 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec480363c33c49f4dd4cd5de9023b6ddad2f3d8b39ee90b4a67bc282a2b35f3
-  data.tar.gz: 6db9e48a3bb04e73ae91f01c63640b36db530f04a06245462b4e4d72e2f083c0
+  metadata.gz: a9ad362290b7ac95e9ad1c466868f81bad354df55b9772742c9bf6591f9f762d
+  data.tar.gz: 0ff078fc8e40af83f984729f3320856af95cf95b3562f97bc17b0b8787342a12
 SHA512:
-  metadata.gz: 694720a4ff3a557ebdf03cf94bb38010e9c52eacbf188c26f4b3e6e6c7adbd08353e31aae214797bbc79e7493f9d53f178b866b017e4c5feba13a23d253b1449
-  data.tar.gz: 7ba4120f8e7ddc71b2f7d2783c854f9f6ac5b1935260fb7c769d96f1e0ac900ffa8cbb2b3233dd7ccd4d3e7b38d4c702dc9a142a29fd45a2258b0e27ad69ad42
+  metadata.gz: 93b68e1d07bfe82c469d1169d7e94fa2dece7a7f32fc01adcf895356bdfa285d7d1352b1a37e3bd7b50e1023551160988b4dc7a49c97d904b1b4c37d77d1e676
+  data.tar.gz: 44aa0eda58e8d5f50f9d99d1b44a81ade7781ba9cad9cf35b47e6b3dcab2f2699c69898e774b33c3a00c535b4927481b3bb62411856f607ff78b24e34dd320a5

data/.rubocop.yml

@@ -11,7 +11,7 @@ Metrics/AbcSize:
     - spec/db_helper.rb
 
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
     - let
     - it
     - describe

data/.travis.yml

@@ -1,6 +1,7 @@
 env:
   global:
     - CC_TEST_REPORTER_ID=036a8fd92cf0c323c9704c041015837d14889e47de936bab18287626ff3372c1
+    - DISABLE_RSPEC_FOCUS=true
 language: ruby
 services:
   - mysql
@@ -8,7 +9,7 @@ rvm:
   # Build on the latest stable of all supported Rubies (https://www.ruby-lang.org/en/downloads/):
   - 2.5.8
   - 2.6.6
-  - 2.7.1
+  - 2.7.2
 env:
   - AR_VERSION=5
   - AR_VERSION=6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.2.0 (March 11th, 2021)
+
+### Additions:
+
+* Support for graph based models.
+
 # 2.1.2 (October 15th, 2020)
 
 * Improved test coverage for Where maker

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/dbee-active_record.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     end
 
   s.add_dependency('activerecord', activerecord_version)
-  s.add_dependency('dbee', '~>2', '>=2.1.1')
+  s.add_dependency('dbee', '~>3')
 
   s.add_development_dependency('guard-rspec', '~>4.7')
   s.add_development_dependency('mysql2', '~>0.5')
@@ -50,8 +50,12 @@ Gem::Specification.new do |s|
   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.90.0')
+  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.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

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

@@ -12,48 +12,21 @@ require_relative 'maker'
 module Dbee
   module Providers
     class ActiveRecordProvider
-      # This class can generate an Arel expression tree.
+      # 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)
+        def initialize(schema, table_alias_maker, column_alias_maker)
           super(column_alias_maker)
 
-          @model             = model
+          @schema            = schema
           @table_alias_maker = table_alias_maker
-
-          clear
-        end
-
-        def clear
-          @requires_group_by  = false
-          @group_by_columns   = []
-          @base_table         = make_table(model.table, model.name)
-          @select_all         = true
-
-          build(base_table)
-
-          add_partitioners(base_table, model.partitioners)
-        end
-
-        def add(query)
-          return self unless 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
+        def to_sql(query)
+          reset_query_state
+          build_query(query)
 
           return statement.project(select_maker.star(base_table)).to_sql if select_all
 
@@ -63,19 +36,46 @@ module Dbee
         private
 
         attr_reader :base_table,
+                    :key_paths_to_arel_columns,
+                    :from_model,
                     :statement,
-                    :model,
                     :table_alias_maker,
                     :requires_group_by,
                     :group_by_columns,
-                    :select_all
+                    :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 tables
-          @tables ||= {}
+        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)
+
+          statement.group(group_by_columns) if requires_group_by && !group_by_columns.empty?
         end
 
-        def key_paths_to_arel_columns
-          @key_paths_to_arel_columns ||= {}
+        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 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)
@@ -151,33 +151,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_maker.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/version.rb

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      VERSION = '2.1.2'
+      VERSION = '2.2.0'
     end
   end
 end

data/spec/dbee/providers/active_record_provider/expression_builder_spec.rb

@@ -11,11 +11,14 @@ require 'spec_helper'
 require 'db_helper'
 
 describe Dbee::Providers::ActiveRecordProvider::ExpressionBuilder do
-  let(:model)       { Dbee::Model.make(models['Patients']) }
+  let(:schema)      { Dbee::Schema.new(models['Patients']) }
   let(:alias_maker) { Dbee::Providers::ActiveRecordProvider::SafeAliasMaker.new }
 
+  let(:empty_query) { Dbee::Query.make(from: :patients) }
+
   let(:id_and_average_query) do
     Dbee::Query.make(
+      from: :patients,
       fields: [
         {
           key_path: :id,
@@ -43,6 +46,7 @@ describe Dbee::Providers::ActiveRecordProvider::ExpressionBuilder do
 
   let(:first_and_count_query) do
     Dbee::Query.make(
+      from: :patients,
       fields: [
         {
           key_path: :first,
@@ -57,60 +61,29 @@ describe Dbee::Providers::ActiveRecordProvider::ExpressionBuilder do
     )
   end
 
-  subject { described_class.new(model, alias_maker, alias_maker) }
+  subject { described_class.new(schema, alias_maker, alias_maker) }
 
   before(:all) do
     connect_to_db(:sqlite)
   end
 
-  describe '#clear' do
-    it 'provides fluent interface (returns self)' do
-      expect(subject.clear).to eq(subject)
-    end
-
-    it 'resets selecting, grouping, sorting, and filtering' do
-      subject.add(id_and_average_query)
-
-      sql = subject.to_sql
-
-      expect(sql).not_to include('*')
-      expect(sql).to     include('GROUP')
-      expect(sql).to     include('WHERE')
-      expect(sql).to     include('ORDER')
-
-      sql = subject.clear.to_sql
-
-      expect(sql).to     include('*')
-      expect(sql).not_to include('GROUP')
-      expect(sql).not_to include('WHERE')
-      expect(sql).not_to include('ORDER')
-    end
-  end
-
   describe '#to_sql' do
     specify 'when called with no fields, then called with fields removes star select' do
-      expect(subject.to_sql).to include('*')
-
-      subject.add(id_and_average_query)
-
-      expect(subject.to_sql).not_to include('*')
+      expect(subject.to_sql(empty_query)).to include('*')
+      expect(subject.to_sql(id_and_average_query)).not_to include('*')
     end
 
     context 'with aggregation' do
       it 'generates the same sql when called multiple times' do
-        subject.add(id_and_average_query)
-
-        first_sql  = subject.to_sql
-        second_sql = subject.to_sql
+        first_sql  = subject.to_sql(id_and_average_query)
+        second_sql = subject.to_sql(id_and_average_query)
 
         expect(first_sql).to eq(second_sql)
 
-        subject.add(first_and_count_query)
-
-        first_sql  = subject.to_sql
-        second_sql = subject.to_sql
+        third_sql  = subject.to_sql(first_and_count_query)
+        fourth_sql = subject.to_sql(first_and_count_query)
 
-        expect(first_sql).to eq(second_sql)
+        expect(third_sql).to eq(fourth_sql)
       end
     end
   end

data/spec/dbee/providers/active_record_provider_spec.rb

@@ -17,14 +17,13 @@ describe Dbee::Providers::ActiveRecordProvider do
     end
 
     it 'errors when joining tables with no constraints' do
-      model_hash = {
-        name: :users,
-        models: [
-          { name: :logins }
-        ]
+      schema_hash = {
+        users: { relationships: { logins: nil } },
+        logins: nil
       }
 
       query_hash = {
+        from: :users,
         fields: [
           { key_path: 'id' },
           { key_path: 'logins.id' }
@@ -32,11 +31,11 @@ describe Dbee::Providers::ActiveRecordProvider do
       }
 
       query = Dbee::Query.make(query_hash)
-      model = Dbee::Model.make(model_hash)
+      schema = Dbee::Schema.new(schema_hash)
 
       error_class = Dbee::Providers::ActiveRecordProvider::ExpressionBuilder::MissingConstraintError
 
-      expect { described_class.new.sql(model, query) }.to raise_error(error_class)
+      expect { described_class.new.sql(schema, query) }.to raise_error(error_class)
     end
   end
 
@@ -55,12 +54,13 @@ describe Dbee::Providers::ActiveRecordProvider do
               yaml_fixture_files('active_record_snapshots').each_pair do |filename, snapshot|
                 specify File.basename(filename) do
                   model_name = snapshot['model_name']
+
                   query = Dbee::Query.make(snapshot['query'])
-                  model = Dbee::Model.make(models[model_name])
+                  schema = Dbee::Schema.new(models[model_name])
 
                   expected_5_sql  = snapshot[key].to_s.chomp.tr("\n", ' ')
                   expected_6_sql  = expected_5_sql.gsub('  ', ' ').gsub("'t'", '1').gsub("'f'", '0')
-                  actual_sql      = described_class.new(readable: readable).sql(model, query)
+                  actual_sql      = described_class.new(readable: readable).sql(schema, query)
 
                   error_msg = <<~ERROR_MSG
                     Expected 5 SQL: #{expected_5_sql}
@@ -93,9 +93,9 @@ describe Dbee::Providers::ActiveRecordProvider do
                 specify File.basename(filename) do
                   model_name = snapshot['model_name']
                   query = Dbee::Query.make(snapshot['query'])
-                  model = Dbee::Model.make(models[model_name])
+                  schema = Dbee::Schema.new(models[model_name])
 
-                  sql = described_class.new(readable: readable).sql(model, query)
+                  sql = described_class.new(readable: readable).sql(schema, query)
 
                   expect { ActiveRecord::Base.connection.execute(sql) }.to_not raise_error
                 end
@@ -126,10 +126,10 @@ describe Dbee::Providers::ActiveRecordProvider do
 
       let(:snapshot) { yaml_file_read(*snapshot_path) }
       let(:query)    { Dbee::Query.make(snapshot['query']) }
-      let(:model)    { Dbee::Model.make(models['Patients']) }
+      let(:schema)   { Dbee::Schema.new(models['Patients']) }
 
       it 'pivots table rows into columns' do
-        sql = described_class.new.sql(model, query)
+        sql = described_class.new.sql(schema, query)
 
         results = ActiveRecord::Base.connection.execute(sql)
 
@@ -171,10 +171,10 @@ describe Dbee::Providers::ActiveRecordProvider do
 
       let(:snapshot) { yaml_file_read(*snapshot_path) }
       let(:query)    { Dbee::Query.make(snapshot['query']) }
-      let(:model)    { Dbee::Model.make(models['Patients']) }
+      let(:schema) { Dbee::Schema.new(models['Patients']) }
 
       it 'executes correct SQL aggregate functions' do
-        sql     = described_class.new.sql(model, query)
+        sql     = described_class.new.sql(schema, query)
         results = ActiveRecord::Base.connection.execute(sql)
 
         expect(results[0]).to include(

data/spec/fixtures/active_record_snapshots/five_table_query.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: members.demos.phone_numbers.phone_number
       display: PHONE NUMBER

data/spec/fixtures/active_record_snapshots/multiple_same_table_query_with_static_constraints.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
     - key_path: name

data/spec/fixtures/active_record_snapshots/one_table_empty_query.yaml

@@ -1,5 +1,6 @@
 model_name: Patients
 query:
+  from: patients
 sqlite_readable: |+
   SELECT "patients".* FROM "patients" "patients"
 sqlite_not_readable: |+

data/spec/fixtures/active_record_snapshots/one_table_query.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
       display: 'ID #'

data/spec/fixtures/active_record_snapshots/one_table_query_with_ascending_sort.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
     - key_path: name

data/spec/fixtures/active_record_snapshots/one_table_query_with_descending_sort.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
     - key_path: name

data/spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
       display: 'ID #'

data/spec/fixtures/active_record_snapshots/one_table_query_with_limit.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
     - key_path: name

data/spec/fixtures/active_record_snapshots/one_table_query_with_multiple_sorts.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
     - key_path: name

data/spec/fixtures/active_record_snapshots/partitioner_example_1_query.yaml

@@ -1,5 +1,6 @@
 model_name: Partitioner Example 1
 query:
+  from: dogs
   fields:
     - key_path: id
 sqlite_readable: |+

data/spec/fixtures/active_record_snapshots/partitioner_example_2_query.yaml

@@ -1,5 +1,6 @@
 model_name: Partitioner Example 2
 query:
+  from: owners
   fields:
     - key_path: id
     - key_path: dogs.id

data/spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml

@@ -1,5 +1,6 @@
 model_name: Reverse Polymorphic Example
 query:
+  from: animals
   fields:
     - key_path: id
     - key_path: type

data/spec/fixtures/active_record_snapshots/two_table_query.yaml

@@ -1,5 +1,6 @@
 model_name: Theaters, Members, and Movies
 query:
+  from: theaters
   fields:
     - key_path: id
     - key_path: name

data/spec/fixtures/active_record_snapshots/two_table_query_with_aggregation.yaml

@@ -1,5 +1,6 @@
 model_name: Patients
 query:
+  from: patients
   fields:
     - key_path: id
       display: 'ID #'

data/spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml

@@ -1,5 +1,6 @@
 model_name: Patients
 query:
+  from: patients
   fields:
     - key_path: id
       display: 'ID #'

data/spec/fixtures/models.yaml

@@ -1,125 +1,133 @@
 Theaters, Members, and Movies:
-  name: theaters
-  table: theaters
-  models:
-    - name: members
-      table: members
-      constraints:
-        - type: reference
-          parent: id
-          name: tid
-        - type: reference
-          parent: partition
-          name: partition
-      models:
-        - name: demos
-          table: demographics
-          constraints:
-            - type: reference
-              parent: id
-              name: member_id
-          models:
-            - name: phone_numbers
-              table: phone_numbers
-              constraints:
-                - type: reference
-                  parent: id
-                  name: demographic_id
-        - name: movies
-          table: movies
-          constraints:
-            - type: reference
-              parent: id
-              name: member_id
-        - name: favorite_comic_movies
-          table: movies
-          constraints:
-            - type: reference
-              parent: id
-              name: member_id
-            - type: static
-              name: genre
-              value: comic
-        - name: favorite_mystery_movies
-          table: movies
-          constraints:
-            - type: reference
-              parent: id
-              name: member_id
-            - type: static
-              name: genre
-              value: mystery
-        - name: favorite_comedy_movies
-          table: movies
-          constraints:
-            - type: reference
-              parent: id
-              name: member_id
-            - type: static
-              name: genre
-              value: comedy
+  theaters:
+    relationships:
+      members:
+        constraints:
+          - type: reference
+            parent: id
+            name: tid
+          - type: reference
+            parent: partition
+            name: partition
+  members:
+    relationships:
+      demos:
+        model: demographics
+        constraints:
+          - type: reference
+            parent: id
+            name: member_id
+      movies:
+        constraints:
+          - type: reference
+            parent: id
+            name: member_id
+      favorite_comic_movies:
+        model: movies
+        constraints:
+          - type: reference
+            parent: id
+            name: member_id
+          - type: static
+            name: genre
+            value: comic
+      favorite_mystery_movies:
+        model: movies
+        constraints:
+          - type: reference
+            parent: id
+            name: member_id
+          - type: static
+            name: genre
+            value: mystery
+      favorite_comedy_movies:
+        model: movies
+        constraints:
+          - type: reference
+            parent: id
+            name: member_id
+          - type: static
+            name: genre
+            value: comedy
+  demographics:
+    table: demographics
+    relationships:
+      phone_numbers:
+        constraints:
+          - type: reference
+            parent: id
+            name: demographic_id
+  phone_numbers:
+  movies:
+
 Reverse Polymorphic Example:
   # In this example, an animal has a toy, but that toy is either a dog or cat toy, depending on
   # the type of the animal.  So for this to work in this direction, static constraints pointed
   # at the parent (animals) is needed.
-  name: animals
-  models:
-    - name: dog_toy
-      table: dog_toys
+  animals:
+   relationships:
+    dog_toy:
+      model: dog_toys
       constraints:
         - parent: toy_id
           name: id
         - type: static
           parent: type
           value: Dog
-    - name: cat_toy
-      table: cat_toys
+    cat_toy:
+      model: cat_toys
       constraints:
         - parent: toy_id
           name: id
         - type: static
           parent: type
           value: Cat
+  dog_toys:
+  cat_toys:
 
 Partitioner Example 1:
-  name: dogs
-  table: animals
-  partitioners:
-    - name: type
-      value: Dog
-    - name: deleted
-      value: false
+  dogs:
+    table: animals
+    partitioners:
+      - name: type
+        value: Dog
+      - name: deleted
+        value: false
 
 Partitioner Example 2:
-  name: owners
-  models:
-    - name: dogs
-      table: animals
-      constraints:
-        - name: owner_id
-          parent: id
-      partitioners:
-        - name: type
-          value: Dog
-        - name: deleted
-          value: false
+  owners:
+    relationships:
+      dogs:
+        constraints:
+          - name: owner_id
+            parent: id
+  dogs:
+    table: animals
+    partitioners:
+      - name: type
+        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
+  patients:
+    relationships:
+      patient_payments:
+        constraints:
+          - type: reference
+            parent: id
+            name: patient_id
+      patient_field_values:
+        constraints:
+          - type: reference
+            parent: id
+            name: patient_id
+  patient_field_values:
+    relationships:
+      fields:
+        constraints:
+          - type: reference
+            parent: field_id
+            name: id
+  patient_payments:
+  fields:

data/spec/spec_helper.rb

@@ -7,8 +7,15 @@
 # LICENSE file in the root directory of this source tree.
 #
 
-require 'yaml'
 require 'pry'
+require 'super_diff/rspec'
+require 'yaml'
+
+RSpec.configure do |config|
+  # Allow for disabling auto focus mode in certain environments like CI to
+  # prevent false positives when only a subset of the suite passes.
+  config.filter_run_when_matching :focus unless ENV['DISABLE_RSPEC_FOCUS'] == 'true'
+end
 
 unless ENV['DISABLE_SIMPLECOV'] == 'true'
   require 'simplecov'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Matthew Ruggio
 - Craig Kattner
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -37,20 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +135,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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: rubocop-rspec
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +213,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: super_diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: "    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.\n"
 email:
@@ -256,7 +292,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Plugs in ActiveRecord so Dbee can use Arel for SQL generation.
 test_files: