dbee-active_record 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 382941d933c56ac2efc758119b32568638f6ac4d2842bcfe0e84cbb6d03f5994
-  data.tar.gz: 80a5aedc314d37202c0e976160168c8ecbeaa17e64c0f4be44bdfa48c97a6e1e
+  metadata.gz: 9f50827b6f31ffb9749796b4532b8a48f704c522be4e0011b7e9a58ed716dd26
+  data.tar.gz: e9469a99514bfdfbe03da6cdcda339aef1b12b2d829a82d7e2278a22b006f0b3
 SHA512:
-  metadata.gz: 68df7e7994baf9cb29ea0ea6d2860e4bcf2509af4e046568064458b5f6309d0cba3d791d8b1461080bcd4e73706cd00b696106f8ede28bb89afc0c0529801f30
-  data.tar.gz: 15a4a9fdd0597b4cfa69e2a216c30f4ab51a64521c419f51316b12cfed21ebc7d7f4c87871c35a3958f4a3a0b918cb7d15616d2c1986e4ae0f831062a1995fd7
+  metadata.gz: 7162ee879530dd36b2078a347b6fade9a5e5ce8e79f47709b33b11cb308303195cbafb3e6096a1529ddb7b7c23da6a19caccdc61356f29dd14b48b4e077cc041
+  data.tar.gz: 6d19989ed13fd0e2d7a88b3341309cf517aede0f4924c8f76f1325685a099b4b20985774adb445b0bb3487c9d91568500a86c767237618f57194e2806ee0fa93

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 2.0.3 (January 7th, 2019)
+# 2.0.4 (February 13th, 2020)
+
+* use Arel#in for Equal filters when there is more than one value
+* use Arel#not_in for NotEqual filters when there are is than one value
+
+# 2.0.3 (January 7th, 2020)
 
 * Added/tested support for Dbee 2.0.3
 * Added support for Ruby 2.6.5

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

@@ -31,6 +31,24 @@ module Dbee
           private_constant :FILTER_EVALUATORS
 
           def make(filter, arel_column)
+            values = normalize(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)
+            end
+          end
+
+          private
+
+          def normalize(value)
+            value ? Array(value).flatten : [nil]
+          end
+
+          def use_or(filter, arel_column)
             predicates = normalize(filter.value).map do |coerced_value|
               method = FILTER_EVALUATORS[filter.class]
 
@@ -43,12 +61,6 @@ module Dbee
               memo.or(predicate)
             end
           end
-
-          private
-
-          def normalize(value)
-            value ? Array(value).flatten : [nil]
-          end
         end
       end
     end

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

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

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" IN ('t', 'f', NULL) AND
+  "theaters"."inspected" IN ('f', 't', NULL) 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" IN ('t', 'f', NULL) AND
+  "t0"."inspected" IN ('f', 't', NULL) 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` IN (TRUE, FALSE, NULL) AND
+  `theaters`.`inspected` IN (FALSE, TRUE, NULL) 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` IN (TRUE, FALSE, NULL) AND
+  `t0`.`inspected` IN (FALSE, TRUE, NULL) 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%')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord