valkyrie-sequel 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a74b8f8a7ba365deb8fcda493a2289a579580018ba4d9251684a9bcc02d3665
-  data.tar.gz: 70774d437ef4fdc8e75566ca4c1942bbc66f247eee19b49a3017cea3097b66af
+  metadata.gz: 89a976b76238995b845b6b1d5d82cbf3a24afa1e92c795590f8045fa19a9295c
+  data.tar.gz: 63c6b8e510197296ccc2b83428b00d40ab1f974b18f6db05c7dc28c62a955ec9
 SHA512:
-  metadata.gz: dad38881c3959f86f9febc7fe1a1ea5e62fea9310af9715c27da3087cfe4af6ebfed20ab9e48de6b99e775901f818aeca5beb2e3fd215b3a7adf81cb87ceff1e
-  data.tar.gz: 160c5f59b084e3594995d492773d16734daaaa98141b9340f4859914a7710fa3426d3f5b38e97efd56b19f527ac618210280e96de2f8521b6afca55de352d05d
+  metadata.gz: 71293e3bc4635ba2df250558612088e8dfcb2a7a77cc6923c27c1da7567b09e3c112d462ab0063985084f5a89c32a33ec4fd9aea2ff0120df74ce1583aad67c3
+  data.tar.gz: 9ec49446c6f760ddba814e51154cde6e842d86fc76fbc81bf8b484f3478a2a23e1a27befca96239d41e0a14da561174b4e032902e8809143d861c7c00b4aa121

data/lib/valkyrie/sequel/query_service.rb

@@ -29,6 +29,13 @@ module Valkyrie::Sequel
       end
     end
 
+    # Count all records for a specific resource type
+    # @param [Class] model
+    # @return integer
+    def count_all_of_model(model:)
+      resources.where(internal_resource: model.to_s).count
+    end
+
     def find_many_by_ids(ids:)
       ids = ids.map do |id|
         id = Valkyrie::ID.new(id.to_s) if id.is_a?(String)
@@ -44,22 +51,26 @@ module Valkyrie::Sequel
       end
     end
 
-    def find_references_by(resource:, property:)
+    def find_references_by(resource:, property:, model: nil)
       return [] if resource.id.blank? || resource[property].blank?
       # only return ordered if needed to avoid performance penalties
       if ordered_property?(resource: resource, property: property)
-        run_query(find_ordered_references_query, property.to_s, resource.id.to_s)
+        find_ordered_references_by(resource: resource, property: property, model: model)
       else
-        run_query(find_references_query, property.to_s, resource.id.to_s)
+        find_unordered_references_by(resource: resource, property: property, model: model)
       end
     end
 
-    def find_inverse_references_by(resource: nil, id: nil, property:)
+    def find_inverse_references_by(resource: nil, id: nil, model: nil, property:)
       raise ArgumentError, "Provide resource or id" unless resource || id
       ensure_persisted(resource) if resource
       id ||= resource.id
       internal_array = { property => [id: id.to_s] }
-      run_query(find_inverse_references_query, internal_array.to_json)
+      if model
+        run_query(find_inverse_references_with_model_query, internal_array.to_json, model.to_s)
+      else
+        run_query(find_inverse_references_query, internal_array.to_json)
+      end
     end
 
     # Find and a record using a Valkyrie ID for an alternate ID, and construct
@@ -150,6 +161,14 @@ module Valkyrie::Sequel
         SQL
       end
 
+      def find_inverse_references_with_model_query
+        <<-SQL
+          SELECT * FROM orm_resources WHERE
+          metadata @> ?
+          AND internal_resource = ?
+        SQL
+      end
+
       # Generate the SQL query for retrieving member resources in PostgreSQL using a
       #   JSON object literal and resource ID as arguments.
       # @see https://guides.rubyonrails.org/active_record_querying.html#array-conditions
@@ -167,6 +186,15 @@ module Valkyrie::Sequel
         SQL
       end
 
+      def find_references_with_type_query
+        <<-SQL
+          SELECT DISTINCT member.* FROM orm_resources a,
+          jsonb_array_elements(a.metadata->?) AS b(member)
+          JOIN orm_resources member ON (b.member->>'id')::#{id_type} = member.id WHERE a.id = ?
+          AND member.internal_resource = ?
+        SQL
+      end
+
       def find_ordered_references_query
         <<-SQL
           SELECT member.* FROM orm_resources a,
@@ -176,6 +204,16 @@ module Valkyrie::Sequel
         SQL
       end
 
+      def find_ordered_references_with_type_query
+        <<-SQL
+          SELECT member.* FROM orm_resources a,
+          jsonb_array_elements(a.metadata->?) WITH ORDINALITY AS b(member, member_pos)
+          JOIN orm_resources member ON (b.member->>'id')::#{id_type} = member.id WHERE a.id = ?
+          AND member.internal_resource = ?
+          ORDER BY b.member_pos
+        SQL
+      end
+
       # Accesses the data type in PostgreSQL used for the primary key
       # (For example, a UUID)
       # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaCache.html#method-i-columns_hash
@@ -201,5 +239,21 @@ module Valkyrie::Sequel
       def ordered_property?(resource:, property:)
         resource.ordered_attribute?(property)
       end
+
+      def find_ordered_references_by(resource:, property:, model: nil)
+        if model
+          run_query(find_ordered_references_with_type_query, property.to_s, resource.id.to_s, model.to_s)
+        else
+          run_query(find_ordered_references_query, property.to_s, resource.id.to_s)
+        end
+      end
+
+      def find_unordered_references_by(resource:, property:, model: nil)
+        if model
+          run_query(find_references_with_type_query, property.to_s, resource.id.to_s, model.to_s)
+        else
+          run_query(find_references_query, property.to_s, resource.id.to_s)
+        end
+      end
   end
 end

data/lib/valkyrie/sequel/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Valkyrie
   module Sequel
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

data/valkyrie-sequel.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sequel"
   spec.add_dependency "sequel_pg"
-  spec.add_dependency "valkyrie", '~> 2.0.0'
+  spec.add_dependency "valkyrie", '~> 2.1.0'
   spec.add_dependency "oj"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-sequel
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement