sequel-association-filtering 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9148c1cf2c63a77fec6b64d6064a39cac6e811d0ec53feeb69b880e15a61e2
-  data.tar.gz: 66a54816ac8284a3bb67e081d4637648a9c0c1979827ee2a32cf3865dde2483c
+  metadata.gz: eebfe24a7a4bc0831e9b5d983f7d49c46f1af66b531b137cbad11d65195c02dd
+  data.tar.gz: 812a28ac539eab752717576a44cd63f4e95d306c9ceeb3830f044227ec6c09db
 SHA512:
-  metadata.gz: b06d337f0702b7381689eb9d7cf62114e73ce7e38ee5a7fcc8f7ed19e1416aa9623848f4179a3787b3db37e838666b4736ee448c30a4354275fd224e62dcc8e2
-  data.tar.gz: f053fbae21edb9996e1a8a367c81feb5f23eae56d9e349dbdeecc6a2975f8b06a16e656b8cabc604fedaa86412bb7b78cad3c4a06050965eaea35e58ed623999
+  metadata.gz: d87c8e29c99c922be6411c7f74589b3685781502a38131f7f832465a334ab62cbee3125ba0fe4c844b98d496d1c0ef49cba6091c1f96c0268a0b46bc75f665d6
+  data.tar.gz: 00155ca49d9f3f01d8b4cf7385f81bb8e72e0acb8ec2db436ee3ae74468cb606cab343ac52e62120a65b4f5c129eaa3cb3a1ea6212fdd9f30520372cc3173087

data/lib/sequel/plugins/association_filtering.rb

@@ -19,27 +19,47 @@ module Sequel
       end
 
       module DatasetMethods
-        def association_filter(association_name, invert: false)
+        COUNT_STAR = Sequel.virtual_row{count.function.*}
+
+        def association_filter(
+          association_name,
+          invert: false,
+          at_least: nil,
+          at_most: nil,
+          exactly: nil
+        )
+          case [at_least, at_most, exactly].compact.length
+          when 0
+            filtering_by_count = false
+          when 1
+            filtering_by_count = true
+          else
+            raise Error, "cannot pass more than one of :at_least, :at_most, and :exactly"
+          end
+
           reflection =
             model.association_reflections.fetch(association_name) do
               raise Error, "association #{association_name} not found on model #{model}"
             end
 
-          if block_given?
-            cond = yield(_association_filter_dataset(reflection)).exists
-            invert ? exclude(cond) : where(cond)
-          else
-            cache_key =
-              _association_filter_cache_key(
-                reflection: reflection,
-                extra: :"bare_#{invert}",
-              )
+          ds = _association_filter_dataset(reflection, group_by_remote: filtering_by_count)
+          ds = yield(ds) if block_given?
 
-            cached_dataset(cache_key) do
-              cond = _association_filter_dataset(reflection).exists
-              invert ? exclude(cond) : where(cond)
-            end
+          if filtering_by_count
+            ds =
+              ds.having(
+                case
+                when at_least then COUNT_STAR >= at_least
+                when at_most  then COUNT_STAR <= at_most
+                when exactly  then COUNT_STAR =~ exactly
+                else raise Error, ""
+                end
+              )
           end
+
+          cond = ds.exists
+          cond = Sequel.~(cond) if invert
+          where(cond)
         end
 
         def association_exclude(association_name, &block)
@@ -48,8 +68,12 @@ module Sequel
 
         private
 
-        def _association_filter_dataset(reflection)
-          cache_key = _association_filter_cache_key(reflection: reflection)
+        def _association_filter_dataset(reflection, group_by_remote:)
+          cache_key =
+            _association_filter_cache_key(
+              reflection: reflection,
+              extra: (:group_by_remote if group_by_remote)
+            )
 
           ds = reflection.associated_dataset
 
@@ -71,12 +95,19 @@ module Sequel
             local_keys  = Array(local_keys)
             remote_keys = Array(remote_keys)
 
-            ds.where(
-              remote_keys.
-              zip(local_keys).
-              map{|r,l| {r => l}}.
-              inject{|a,b| Sequel.&(a, b)}
-            ).select(1)
+            result =
+              ds.where(
+                remote_keys.
+                zip(local_keys).
+                map{|r,l| {r => l}}.
+                inject{|a,b| Sequel.&(a, b)}
+              ).select(1)
+
+            if group_by_remote
+              result.group_by(*remote_keys)
+            else
+              result
+            end
           end
         end
 

data/lib/sequel/plugins/association_filtering/version.rb

@@ -3,7 +3,7 @@
 module Sequel
   module Plugins
     module AssociationFiltering
-      VERSION = '0.0.4'
+      VERSION = '0.0.5'
     end
   end
 end

data/spec/basic_spec.rb

@@ -29,5 +29,14 @@ class BasicSpec < AssociationFilteringSpecs
 
       assert_equal "association widgets not found on model BasicSpec::Artist", error.message
     end
+
+    it "with more than one of at_least, at_most, or exactly should throw an error" do
+      error =
+        assert_raises(Sequel::Plugins::AssociationFiltering::Error) do
+          Artist.association_filter(:widgets, at_most: 4, exactly: 5)
+        end
+
+      assert_equal "cannot pass more than one of :at_least, :at_most, and :exactly", error.message
+    end
   end
 end

data/spec/one_to_many_spec.rb

@@ -58,6 +58,25 @@ class OneToManySpec < AssociationFilteringSpecs
         Album.where(artist_id: 5).delete
         assert_equal 9, ds.count
       end
+
+      it "should support at_least/exactly/at_most args" do
+        Album.create(artist_id: 1)
+
+        ds = Artist.association_filter(:albums, exactly: 11)
+        assert_equal 1, ds.count
+        assert_equal %(SELECT * FROM "artists" WHERE (EXISTS (SELECT 1 FROM "albums" WHERE ("albums"."artist_id" = "artists"."id") GROUP BY "albums"."artist_id" HAVING (count(*) = 11)))), ds.sql
+        assert_equal [1], ds.select_map(:id)
+
+        ds = Artist.association_filter(:albums, at_least: 2){|albums| albums.where{id > 90}}
+        assert_equal 1, ds.count
+        assert_equal %(SELECT * FROM "artists" WHERE (EXISTS (SELECT 1 FROM "albums" WHERE (("albums"."artist_id" = "artists"."id") AND ("id" > 90)) GROUP BY "albums"."artist_id" HAVING (count(*) >= 2)))), ds.sql
+        assert_equal [1], ds.select_map(:id)
+
+        ds = Artist.association_filter(:albums, at_most: 1){|albums| albums.where{id > 90}}
+        assert_equal 9, ds.count
+        assert_equal %(SELECT * FROM "artists" WHERE (EXISTS (SELECT 1 FROM "albums" WHERE (("albums"."artist_id" = "artists"."id") AND ("id" > 90)) GROUP BY "albums"."artist_id" HAVING (count(*) <= 1)))), ds.sql
+        assert_equal (2..10).to_a, ds.select_order_map(:id)
+      end
     end
   end
 
@@ -130,6 +149,25 @@ class OneToManySpec < AssociationFilteringSpecs
         Album.where(id_1: 5, id_2: 6).delete
         assert_equal 99, ds.count
       end
+
+      it "should support at_least/exactly/at_most args" do
+        Album.dataset.insert(id_1: 1, id_2: 1, id_3: 11)
+
+        ds = Artist.association_filter(:albums, exactly: 11)
+        assert_equal 1, ds.count
+        assert_equal %(SELECT * FROM "artists" WHERE (EXISTS (SELECT 1 FROM "albums" WHERE (("albums"."id_1" = "artists"."id_1") AND ("albums"."id_2" = "artists"."id_2")) GROUP BY "albums"."id_1", "albums"."id_2" HAVING (count(*) = 11)))), ds.sql
+        assert_equal [[1, 1]], ds.select_map([:id_1, :id_2])
+
+        ds = Artist.association_filter(:albums, at_least: 2){|albums| albums.where{serial_column > 900}}
+        assert_equal 1, ds.count
+        assert_equal %(SELECT * FROM "artists" WHERE (EXISTS (SELECT 1 FROM "albums" WHERE (("albums"."id_1" = "artists"."id_1") AND ("albums"."id_2" = "artists"."id_2") AND ("serial_column" > 900)) GROUP BY "albums"."id_1", "albums"."id_2" HAVING (count(*) >= 2)))), ds.sql
+        assert_equal [[1, 1]], ds.select_map([:id_1, :id_2])
+
+        ds = Artist.association_filter(:albums, at_most: 1){|albums| albums.where{serial_column > 900}}
+        assert_equal 99, ds.count
+        assert_equal %(SELECT * FROM "artists" WHERE (EXISTS (SELECT 1 FROM "albums" WHERE (("albums"."id_1" = "artists"."id_1") AND ("albums"."id_2" = "artists"."id_2") AND ("serial_column" > 900)) GROUP BY "albums"."id_1", "albums"."id_2" HAVING (count(*) <= 1)))), ds.sql
+        assert_equal (2..100).to_a, ds.select_order_map(:serial_column)
+      end
     end
 
     describe "association_exclude through a one_to_many association" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-association-filtering
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler