dbee-active_record 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75589214484b7918c7ae021e2f1cc2815c44b0fd472e61668197f96acb730031
-  data.tar.gz: a5155b0007182721e669a1930b4f313a28b19935b83b7a0084cbc7c65db07d01
+  metadata.gz: c7ae7d990153562e5ccd108e3887538cc4f18d76ba2f23006b51a4f0db05a015
+  data.tar.gz: 4cd401ef186816cb562c43979c0063f72943021147e91c9f610787c23516c820
 SHA512:
-  metadata.gz: 609909bbc0f1baab5d1dd36296ef86d47aac62f6f13e1a22d8bd674dacd22212e26e16d213fea797e31f90b8c90c1e78738596dad6b3c8b6d1da32ad82dbc476
-  data.tar.gz: c4815033dd066cd1c99faa3e0887467ec017400305bf0046041ec5b689d5b6c14b97ab5ec3d01a5c34bc6d88ad2bbe9089573ba6a92ad823b202a58418f445c0
+  metadata.gz: d325a985ecae65475fa8f36380a93fcae5f9ec9aabec2ee0d70527c1a8cd83be70b9c18b60b26f9f6f5ea651be07699b3a43d80eea2486084f5f7e5e269233ce
+  data.tar.gz: dfb0d7414def705b8a8d07bd78c1e0662a93de6c633c9bd315a6c40f317e7a605e484652725b900a9ac08781d8c1dde3daa39683da501a21ab4a7bbb1bdf29e3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.4 (August 27th, 2019)
+
+* Added support for Dbee static constraint against the parent part of an association.
+
 # 1.0.3 (August 27th, 2019)
 
 * Raises MissingConstraintError when trying to join to a table without at least one constraint.

data/README.md

@@ -53,6 +53,22 @@ Also, do not forget to run Rubocop:
 bundle exec rubocop
 ````
 
+### ActiveRecord Dependency
+
+This library supports both ActiveRecord 5 and 6.  Tests are adapted for both versions and should be ran against both to ensure compatibility.  By default the latest 6 will be chosen unless overridden.
+
+To install gems targeting version 5, run rubocop, and run rspec:
+
+````shell
+AR_VERSION=5 bundle update; AR_VERSION=5 bundle exec rake
+````
+
+To install gems targeting version 6, run rubocop, and run rspec:
+
+````shell
+AR_VERSION=6 bundle update; AR_VERSION=5 bundle exec rake
+````
+
 ### Publishing
 
 Note: ensure you have proper authorization before trying to publish new versions.

data/dbee-active_record.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
     end
 
   s.add_dependency('activerecord', activerecord_version)
-  s.add_dependency('dbee', '~>1', '>=1.0.2')
+  s.add_dependency('dbee', '~>1', '>=1.0.3')
 
   s.add_development_dependency('guard-rspec', '~>4.7')
   s.add_development_dependency('mysql2', '~>0.5')

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

@@ -24,11 +24,20 @@ module Dbee
 
               CONCAT_METHOD.call(on, table[name], previous_table[parent])
             end,
-            Model::Constraints::Static => lambda do |constraint, on, table, _previous_table|
-              name  = constraint.name
+            Model::Constraints::Static => lambda do |constraint, on, table, previous_table|
               value = constraint.value
 
-              CONCAT_METHOD.call(on, table[name], value)
+              unless constraint.name.empty?
+                column_name = constraint.name
+                on = CONCAT_METHOD.call(on, table[column_name], value)
+              end
+
+              unless constraint.parent.empty?
+                column_name = constraint.parent
+                on = CONCAT_METHOD.call(on, previous_table[column_name], value)
+              end
+
+              on
             end
           }.freeze
 

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

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      VERSION = '1.0.3'
+      VERSION = '1.0.4'
     end
   end
 end

data/spec/db_helper.rb

@@ -52,5 +52,22 @@ def load_schema
       t.column :favorite, :boolean, default: false, null: false
       t.timestamps
     end
+
+    create_table :animals do |t|
+      t.column :toy_id, :integer
+      t.column :type, :string
+      t.column :name, :string
+      t.timestamps
+    end
+
+    create_table :dog_toys do |t|
+      t.column :squishy, :boolean
+      t.timestamps
+    end
+
+    create_table :cat_toys do |t|
+      t.column :laser, :boolean
+      t.timestamps
+    end
   end
 end

data/spec/dbee/providers/active_record_provider_spec.rb

@@ -42,10 +42,10 @@ describe Dbee::Providers::ActiveRecordProvider do
     end
   end
 
-  describe 'Snapshot' do
-    context 'Generating SQL' do
+  describe 'snapshot' do
+    context 'sql' do
       %w[sqlite mysql].each do |dbms|
-        context dbms do
+        context "using #{dbms}" do
           before(:all) do
             connect_to_db(dbms)
           end

data/spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml

@@ -0,0 +1,58 @@
+model_name: Reverse Polymorphic Example
+query:
+  fields:
+    - key_path: id
+    - key_path: type
+    - key_path: name
+    - key_path: dog_toy.id
+    - key_path: dog_toy.squishy
+    - key_path: cat_toy.id
+    - key_path: cat_toy.laser
+sqlite_readable: |+
+  SELECT
+   "animals"."id" AS 'id',
+  "animals"."type" AS 'type',
+  "animals"."name" AS 'name',
+  "dog_toy"."id" AS 'dog_toy_id',
+  "dog_toy"."squishy" AS 'dog_toy_squishy',
+  "cat_toy"."id" AS 'cat_toy_id',
+  "cat_toy"."laser" AS 'cat_toy_laser'
+  FROM "animals" "animals"
+  LEFT OUTER JOIN "dog_toys" "dog_toy" ON "dog_toy"."id" = "animals"."toy_id" AND "animals"."type" = 'Dog'
+  LEFT OUTER JOIN "cat_toys" "cat_toy" ON "cat_toy"."id" = "animals"."toy_id" AND "animals"."type" = 'Cat'
+sqlite_not_readable: |+
+  SELECT
+   "t0"."id" AS 'c0',
+   "t0"."type" AS 'c1',
+   "t0"."name" AS 'c2',
+   "t1"."id" AS 'c3',
+   "t1"."squishy" AS 'c4',
+   "t2"."id" AS 'c5',
+   "t2"."laser" AS 'c6'
+   FROM "animals" "t0"
+   LEFT OUTER JOIN "dog_toys" "t1" ON "t1"."id" = "t0"."toy_id" AND "t0"."type" = 'Dog'
+   LEFT OUTER JOIN "cat_toys" "t2" ON "t2"."id" = "t0"."toy_id" AND "t0"."type" = 'Cat'
+mysql_readable: |+
+  SELECT
+   `animals`.`id` AS 'id',
+  `animals`.`type` AS 'type',
+  `animals`.`name` AS 'name',
+  `dog_toy`.`id` AS 'dog_toy_id',
+  `dog_toy`.`squishy` AS 'dog_toy_squishy',
+  `cat_toy`.`id` AS 'cat_toy_id',
+  `cat_toy`.`laser` AS 'cat_toy_laser'
+  FROM `animals` `animals`
+  LEFT OUTER JOIN `dog_toys` `dog_toy` ON `dog_toy`.`id` = `animals`.`toy_id` AND `animals`.`type` = 'Dog'
+  LEFT OUTER JOIN `cat_toys` `cat_toy` ON `cat_toy`.`id` = `animals`.`toy_id` AND `animals`.`type` = 'Cat'
+mysql_not_readable: |+
+  SELECT
+   `t0`.`id` AS 'c0',
+  `t0`.`type` AS 'c1',
+  `t0`.`name` AS 'c2',
+  `t1`.`id` AS 'c3',
+  `t1`.`squishy` AS 'c4',
+  `t2`.`id` AS 'c5',
+  `t2`.`laser` AS 'c6'
+  FROM `animals` `t0`
+  LEFT OUTER JOIN `dog_toys` `t1` ON `t1`.`id` = `t0`.`toy_id` AND `t0`.`type` = 'Dog'
+  LEFT OUTER JOIN `cat_toys` `t2` ON `t2`.`id` = `t0`.`toy_id` AND `t0`.`type` = 'Cat'

data/spec/fixtures/models.yaml

@@ -58,3 +58,25 @@ Theaters, Members, and Movies:
             - type: static
               name: genre
               value: comedy
+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
+      constraints:
+        - parent: toy_id
+          name: id
+        - type: static
+          parent: type
+          value: Dog
+    - name: cat_toy
+      table: cat_toys
+      constraints:
+        - parent: toy_id
+          name: id
+        - type: static
+          parent: type
+          value: Cat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Matthew Ruggio
@@ -39,7 +39,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_limit.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_multiple_sorts.yaml
+- spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml
 - spec/fixtures/active_record_snapshots/two_table_query.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb
@@ -257,6 +258,7 @@ test_files:
 - spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_limit.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_multiple_sorts.yaml
+- spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml
 - spec/fixtures/active_record_snapshots/two_table_query.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb