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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8de8c388637ba455ffca406ff42751ecfb62f4a40bbcb9f560a085b585568a1
-  data.tar.gz: 9723886e37e886d7df7fa4661df4c81d35fe186d08a7d82de66083e08ed44bac
+  metadata.gz: 75d42ea7f3b391ad5014264a4b914339bf7dff8582aebe85c4c3180576ae7648
+  data.tar.gz: e63553d0dcc906a38b336767dfcf10bcc162807682ae866f4450a80185993b8e
 SHA512:
-  metadata.gz: be75ae14b3c4b0154a0cc4f63950fa86a5f9f16272cd2d5133a4fc4649e2bcd6f7dc5836cf1706c7a9a6b9dba1f1183783038b013bc9e78f5cc5f25e9c980f78
-  data.tar.gz: 7f466202c164f0da7fb936010bc73393a0643682588f14093979fa1e8844f36bd0978020f3f435624d6bea25d95767af35884c6e453a35f41d219dd4331b22d7
+  metadata.gz: f727e65305615a6e5b2450654ce4bb174674970be4b6855922035dac6bc8378862a003f0c1ec4677433d560dee4f5ca3b9094b57a4be8eae6a7d78720c805910
+  data.tar.gz: 21d91630d8ba8407550dcdd6d8a7aab9bc7dc52ad39679ed5b673f59263f2761e55505c61b8cafcc2ce09a31fee1571e58e9fffc76b24f1dd7a5d3d62e3b4ef7

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

@@ -16,14 +16,19 @@ module Dbee
           include Singleton
 
           def make(filter, arel_column)
-            values = normalize(filter.value)
+            # If the filter has a value of nil, then simply return an IS NULL predicate
+            return make_is_null_predicate(arel_column) unless filter.value
 
-            if filter.is_a?(Query::Filters::Equals) && values.length > 1
-              arel_column.in(values)
-            elsif filter.is_a?(Query::Filters::NotEquals) && values.length > 1
-              arel_column.not_in(values)
-            else
-              use_or(filter, arel_column)
+            values = Array(filter.value).flatten
+
+            # This logic helps ensure that if a null exists that it translates to an IS NULL
+            # predicate and does not get put into an in or not_in clause.
+            predicates = values.include?(nil) ? [make_is_null_predicate(arel_column)] : []
+            predicates += make_predicates(filter, arel_column, values - [nil])
+
+            # Chain all predicates together
+            predicates.inject(predicates.shift) do |memo, predicate|
+              memo.or(predicate)
             end
           end
 
@@ -44,22 +49,40 @@ module Dbee
 
           private_constant :FILTER_EVALUATORS
 
-          def normalize(value)
-            value ? Array(value).flatten : [nil]
+          def make_predicates(filter, arel_column, values)
+            if use_in?(filter, values)
+              [arel_column.in(values)]
+            elsif use_not_in?(filter, values)
+              [arel_column.not_in(values)]
+            else
+              make_or_predicates(filter, arel_column, values)
+            end
           end
 
-          def use_or(filter, arel_column)
-            predicates = normalize(filter.value).map do |coerced_value|
-              method = FILTER_EVALUATORS[filter.class]
+          def use_in?(filter, values)
+            filter.is_a?(Query::Filters::Equals) && values.length > 1
+          end
 
-              raise ArgumentError, "cannot compile filter: #{filter}" unless method
+          def use_not_in?(filter, values)
+            filter.is_a?(Query::Filters::NotEquals) && values.length > 1
+          end
 
-              method.call(arel_column, coerced_value)
+          def make_or_predicates(filter, arel_column, values)
+            values.map do |value|
+              make_predicate(arel_column, filter.class, value)
             end
+          end
 
-            predicates.inject(predicates.shift) do |memo, predicate|
-              memo.or(predicate)
-            end
+          def make_predicate(arel_column, filter_class, value)
+            method = FILTER_EVALUATORS[filter_class]
+
+            raise ArgumentError, "cannot compile filter: #{filter}" unless method
+
+            method.call(arel_column, value)
+          end
+
+          def make_is_null_predicate(arel_column)
+            make_predicate(arel_column, Query::Filters::Equals, nil)
           end
         end
       end

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

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

data/spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml

@@ -67,8 +67,8 @@ sqlite_readable: |+
   "theaters"."name" LIKE 'A%' AND
   "theaters"."name" LIKE '%m%' AND
   "theaters"."active" = 'false' AND
-  "theaters"."active" IN ('t', 'f', NULL) AND
-  "theaters"."inspected" IN ('f', 't', 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
@@ -85,8 +85,8 @@ sqlite_not_readable: |+
   "t0"."name" LIKE 'A%' AND
   "t0"."name" LIKE '%m%' AND
   "t0"."active" = 'false' AND
-  "t0"."active" IN ('t', 'f', NULL) AND
-  "t0"."inspected" IN ('f', 't', 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
@@ -103,8 +103,8 @@ mysql_readable: |+
   `theaters`.`name` LIKE 'A%' AND
   `theaters`.`name` LIKE '%m%' AND
   `theaters`.`active` = 'false' AND
-  `theaters`.`active` IN (TRUE, FALSE, NULL) AND
-  `theaters`.`inspected` IN (FALSE, TRUE, 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
@@ -121,8 +121,8 @@ mysql_not_readable: |+
   `t0`.`name` LIKE 'A%' AND
   `t0`.`name` LIKE '%m%' AND
   `t0`.`active` = 'false' AND
-  `t0`.`active` IN (TRUE, FALSE, NULL) AND
-  `t0`.`inspected` IN (FALSE, TRUE, 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.alpha
+  version: 2.1.0.pre.alpha.1
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord