mikras_utils 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039c1d561f66158183511f72a09ce9b76b3de0c7110d8e6aadce11b338985209'
-  data.tar.gz: dae3de2a17dd845f6a350ec3b63636e97ff2b565a75d40bd47e429abe5654668
+  metadata.gz: 356975b3f96e8341dba97e96ca170a0fb181c3c8654bc874300144774094daba
+  data.tar.gz: 5cb71f7c6add1f89ca5025bcc9630a58474055516295e50d9ad6a2386cf6eb84
 SHA512:
-  metadata.gz: 4651ae8fc80806930718c561c94ae10547d80654802cb88f19020b020871d5de73cd4b736ad98755f63333f8262c44a438ab6134d87d9f51989d68e5ed1bee43
-  data.tar.gz: 05a47f398922d45c61e3746c28a5fae17a334e38c9a7eb4a35dbdd4764d4d86dcd57b293fa14b6600e80da5f54b26a65aada13e3679ed56aa670107b457e4ebf
+  metadata.gz: 74ba9b96d512f831d0dd1a691d1c6892447ac21f29fe91a1f62a5cd87dfefda93d95229c16ddd063ff6bfe3ae1782ea44bda0189eedf7cf757ee7ab5825e9497
+  data.tar.gz: 1d5a378eddd2900ef31cfcd908bdcdd4f780eaf89a162946bdf445429ef076a8fee43e2b5b7709f3fbc2852f166f43983a4b87064f59574674f64cded967e0de

data/lib/mikras_utils/mkacl/generators/acl_functions.rb

@@ -101,7 +101,7 @@ module MkAcl
             case_roles = rule.roles.select { _1 == _1.upcase }
 
             if !auth_roles.empty?
-              role_seq = conn.quote_value_seq(auth_roles)
+              role_seq = conn.quote_values(auth_roles)
               puts %(
                 -- Find "#{action}" system role ACLs
                 _acls := array[]::integer[];
@@ -114,7 +114,7 @@ module MkAcl
             end
 
             if !case_roles.empty?
-              role_seq = conn.quote_value_seq(case_roles)
+              role_seq = conn.quote_values(case_roles)
               puts  %(
                 -- Find "#{action}" case role ACLs
                 select _acls || array_agg(id)
@@ -151,8 +151,8 @@ module MkAcl
         # Insert a attach record per parent table. This snippet handles
         # multiple parents of a record but the check algorithm probably does
         # not TODO
-        auth_role_list = conn.quote_value_seq table.insert.rules.map(&:auth_roles).flatten
-        case_role_list = conn.quote_value_seq table.insert.rules.map(&:case_roles).flatten
+        auth_role_list = conn.quote_values table.insert.rules.map(&:auth_roles).flatten
+        case_role_list = conn.quote_values table.insert.rules.map(&:case_roles).flatten
         for parent in table.parents
           id_fields = conn.values %(select column_name from acl.links where table_name = '#{table}')
           for id_field in id_fields

data/lib/mikras_utils/mkacl/generators/id_functions.rb

@@ -9,7 +9,7 @@ module MkAcl
 
       # Map from domain table to list of [table, path, links] tuples. The
       # entries describes the SQL link chain from the table to the given domain
-      # table (cases or events)
+      # table (cases, events, or visits)
       attr_reader :chains
 
       def initialize(generator)
@@ -30,7 +30,7 @@ module MkAcl
             meta.chains
           where src_schema_name = '#{app_schema}'
             and dst_schema_name = '#{app_schema}'
-            and dst_table_name in ('cases', 'events')
+            and dst_table_name in (#{conn.quote_values(DOMAIN_TABLES)})
         )
 
         generate_per_table_id_functions
@@ -45,10 +45,10 @@ module MkAcl
 #     def table_seq() @table_seq ||= spec.tables.map(&:uid).join(', ') end
 
       # Generate a set of per-table functions that returns the associated
-      # case_id/event_id for the given record. The Functions are generated for
-      # each table in the spec file
+      # case_id/event_id/vist_id for the given record. The Functions are
+      # generated for each table in the spec file
       #
-      # The geneated functions are 
+      # The geneated functions are
       #
       #   case_id_of_RECORD(id integer)
       #   event_id_of_RECORD(id integer)
@@ -72,7 +72,7 @@ module MkAcl
       #
       def generate_per_table_id_functions
         # Generate functions by domain
-        for domain in %w(case event)
+        for domain in DOMAINS
 
           # Create the identity functions first. The identity functions are
           # case_id_of_case() and event_id_of_event(). This makes some stuff
@@ -95,7 +95,7 @@ module MkAcl
             record_name = Prick::Inflector.singularize(table_name)
             id_arg = "_#{id_field}"
             signature = "#{acl_schema}.#{id_field}_of_#{record_name}(#{id_arg} integer)"
-            puts "drop function if exists #{signature} cascade;" 
+            puts "drop function if exists #{signature} cascade;"
             puts "create function #{signature} returns integer as $$"
             indent {
               tables.pop
@@ -120,14 +120,17 @@ module MkAcl
           end
         end
 
+        # Tables that references visits, events, and cases
+        visit_tables = chains['visits'].map(&:first)
+
         # Tables that references events and cases
-        event_tables = chains['events'].map(&:first)
+        event_tables = chains['events'].map(&:first) - visit_tables
 
-        # Tables that references only cases 
+        # Tables that references only cases
         case_tables = chains['cases'].map(&:first) - event_tables
 
         # Create domain functions
-        for domain, tables in { case: case_tables, event: event_tables }
+        for domain, tables in { case: case_tables, event: event_tables, visit: visit_tables }
           for table_name in tables
             record_name = Prick::Inflector.singularize(table_name)
             signature = "#{acl_schema}.domain_id_of_#{record_name}(_id integer)"
@@ -154,7 +157,7 @@ module MkAcl
       # specialized versions above
       #
       def generate_general_id_functions
-        for domain in %w(case event)
+        for domain in DOMAINS
           domain_table = Prick::Inflector.pluralize(domain)
           field = "#{domain}_id"
           signature = "#{acl_schema}.#{field}_of(_table varchar, _id integer)"
@@ -162,7 +165,7 @@ module MkAcl
           puts %(
             drop function if exists #{signature} cascade;
             create function #{signature} returns integer as $$
-              select 
+              select
           ).align
           indent(2) {
             puts "case _table"
@@ -174,6 +177,7 @@ module MkAcl
               end
               puts "when 'cases' then _id"
               puts "when 'events' then _id"
+              puts "when 'visits' then _id"
               puts "else null"
             }
             puts "end case;"
@@ -187,7 +191,11 @@ module MkAcl
           -- FIXME: Ugly implementation
           drop function if exists #{signature} cascade;
           create function #{signature} returns integer as $$
-            select coalesce(acl_portal.event_id_of(_table, _id), acl_portal.case_id_of(_table, _id));
+            select coalesce(
+              acl_portal.visit_id_of(_table, _id),
+              acl_portal.event_id_of(_table, _id),
+              acl_portal.case_id_of(_table, _id)
+            );
           $$ language sql;
         ).align
         puts
@@ -199,8 +207,8 @@ module MkAcl
       #   event_id_of(r record)
       #   domain_id_of(r record)
       #
-      # Returns the case or event id associated with the given record. The
-      # record should be an ACL table record type
+      # Returns the case, event, or visit id associated with the given record.
+      # The record should be an ACL table record type
       #
       # Very useful in before insert triggers because it takes a record (eg.
       # NEW) instead of an ID

data/lib/mikras_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MikrasUtils
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/tests/final-functions.sql

@@ -1,8 +1,10 @@
 
+drop function if exists public.current_role_ids() cascade;
+drop function if exists public.current_domain_roles(integer) cascade;
+
 -- Returns an array of role IDs for the current user (from both auth and
 -- app_portal). This array is matched against the relevant ACL field in the RLS
 -- policies so performance is important (TODO)
-drop function if exists public.current_role_ids() cascade;
 create function public.current_role_ids() returns integer[] as $$
   select acl_portal.select_user_acl(public.current_user_id());
 $$ language sql
@@ -13,7 +15,6 @@ $$ language sql
 
 -- Returns an array of app_portal role names (kind) for the current user in the
 -- given domain
-drop function if exists public.current_domain_roles(integer) cascade;
 create function public.current_domain_roles(_domain_id integer) returns text[] as $$
   select coalesce(array_agg(dr.role), array[]::text[])
   from acl_portal.domain_users du

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn