From de570c3dd425125ed6f9c0f98664d47db4967295 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Fri, 13 Sep 2024 20:59:17 +0200
Subject: [PATCH] rbac.RoleType

---
 .../resources/db/changelog/1-rbac/1050-rbac-base.sql | 12 ++++++------
 .../db/changelog/1-rbac/1054-rbac-context.sql        |  2 +-
 .../db/changelog/1-rbac/1080-rbac-global.sql         |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql b/src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql
index 8579dab5..c98f3710 100644
--- a/src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql
+++ b/src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql
@@ -165,13 +165,13 @@ end; $$;
 
  */
 
-create type RbacRoleType as enum ('OWNER', 'ADMIN', 'AGENT', 'TENANT', 'GUEST', 'REFERRER');
+create type rbac.RoleType as enum ('OWNER', 'ADMIN', 'AGENT', 'TENANT', 'GUEST', 'REFERRER');
 
 create table rbac.role
 (
     uuid       uuid primary key references  rbac.reference (uuid) on delete cascade initially deferred, -- initially deferred
     objectUuid uuid not null references rbac.object (uuid) initially deferred,
-    roleType   RbacRoleType not null,
+    roleType   rbac.RoleType not null,
     unique (objectUuid, roleType)
 );
 
@@ -181,7 +181,7 @@ create type RbacRoleDescriptor as
 (
     objectTable varchar(63), -- for human readability and easier debugging
     objectUuid  uuid,
-    roleType    RbacRoleType,
+    roleType    rbac.RoleType,
     assumed     boolean
 );
 
@@ -201,13 +201,13 @@ $$;
 
 
 create or replace function roleDescriptor(
-        objectTable varchar(63), objectUuid uuid, roleType RbacRoleType,
+        objectTable varchar(63), objectUuid uuid, roleType rbac.RoleType,
         assumed boolean = true) -- just for DSL readability, belongs actually to the grant
     returns RbacRoleDescriptor
     returns null on null input
     stable -- leakproof
     language sql as $$
-        select objectTable, objectUuid, roleType::RbacRoleType, assumed;
+        select objectTable, objectUuid, roleType::rbac.RoleType, assumed;
 $$;
 
 create or replace function createRole(roleDescriptor RbacRoleDescriptor)
@@ -243,7 +243,7 @@ create or replace function findRoleId(roleIdName varchar)
     language plpgsql as $$
 declare
     roleParts                 text;
-    roleTypeFromRoleIdName    RbacRoleType;
+    roleTypeFromRoleIdName    rbac.RoleType;
     objectNameFromRoleIdName  text;
     objectTableFromRoleIdName text;
     objectUuidOfRole          uuid;
diff --git a/src/main/resources/db/changelog/1-rbac/1054-rbac-context.sql b/src/main/resources/db/changelog/1-rbac/1054-rbac-context.sql
index 32399b3c..812ce902 100644
--- a/src/main/resources/db/changelog/1-rbac/1054-rbac-context.sql
+++ b/src/main/resources/db/changelog/1-rbac/1054-rbac-context.sql
@@ -33,7 +33,7 @@ declare
     objectTableToAssume varchar(63);
     objectNameToAssume  varchar(63);
     objectUuidToAssume  uuid;
-    roleTypeToAssume    RbacRoleType;
+    roleTypeToAssume    rbac.RoleType;
     roleIdsToAssume     uuid[];
     roleUuidToAssume    uuid;
 begin
diff --git a/src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql b/src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql
index 50fd2404..f12f0a4a 100644
--- a/src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql
+++ b/src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql
@@ -114,7 +114,7 @@ create or replace function globalAdmin(assumed boolean = true)
     returns null on null input
     stable -- leakproof
     language sql as $$
-select 'rbac.global', (select uuid from rbac.object where objectTable = 'rbac.global'), 'ADMIN'::RbacRoleType, assumed;
+select 'rbac.global', (select uuid from rbac.object where objectTable = 'rbac.global'), 'ADMIN'::rbac.RoleType, assumed;
 $$;
 
 begin transaction;
@@ -135,7 +135,7 @@ create or replace function globalGuest(assumed boolean = true)
     returns null on null input
     stable -- leakproof
     language sql as $$
-select 'rbac.global', (select uuid from rbac.object where objectTable = 'rbac.global'), 'GUEST'::RbacRoleType, assumed;
+select 'rbac.global', (select uuid from rbac.object where objectTable = 'rbac.global'), 'GUEST'::rbac.RoleType, assumed;
 $$;
 
 begin transaction;