add schema rbactest (not just 'test')

src/main/java/net/hostsharing/hsadminng/rbac/test/cust/TestCustomerEntity.java

@@ -62,6 +62,6 @@ public class TestCustomerEntity implements BaseEntity<TestCustomerEntity> {
     }
 
     public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("2-test/201-test-customer/2013-test-customer-rbac");
+        rbac().generateWithBaseFileName("2-rbactest/201-rbactest-customer/2013-rbactest-customer-rbac");
     }
 }

src/main/java/net/hostsharing/hsadminng/rbac/test/dom/TestDomainEntity.java

@@ -68,6 +68,6 @@ public class TestDomainEntity implements BaseEntity<TestDomainEntity> {
     }
 
     public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("2-test/203-test-domain/2033-test-domain-rbac");
+        rbac().generateWithBaseFileName("2-rbactest/203-rbactest-domain/2033-rbactest-domain-rbac");
     }
 }

src/main/java/net/hostsharing/hsadminng/rbac/test/pac/TestPackageEntity.java

@@ -69,6 +69,6 @@ public class TestPackageEntity implements BaseEntity<TestPackageEntity> {
     }
 
     public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("2-test/202-test-package/2023-test-package-rbac");
+        rbac().generateWithBaseFileName("2-rbactest/202-rbactest-package/2023-rbactest-package-rbac");
     }
 }

src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql

@@ -3,9 +3,7 @@
 -- ============================================================================
 --changeset michael.hoennig:rbac-base-REFERENCE endDelimiter:--//
 -- ----------------------------------------------------------------------------
-/*
 
- */
 create type rbac.ReferenceType as enum ('rbac.subject', 'rbac.role', 'rbac.permission');
 
 create table rbac.reference
@@ -120,18 +118,20 @@ create or replace function rbac.insert_related_object()
     strict as $$
 declare
     objectUuid uuid;
+    tableSchemaAndName text;
 begin
+    tableSchemaAndName := base.combine_table_schema_and_name(TG_TABLE_SCHEMA, TG_TABLE_NAME);
     if TG_OP = 'INSERT' then
         if NEW.uuid is null then
             insert
                 into rbac.object (objectTable)
-                values (TG_TABLE_NAME)
+                values (tableSchemaAndName)
                 returning uuid into objectUuid;
             NEW.uuid = objectUuid;
         else
             insert
                 into rbac.object (uuid, objectTable)
-                values (NEW.uuid, TG_TABLE_NAME)
+                values (NEW.uuid, tableSchemaAndName)
                 returning uuid into objectUuid;
         end if;
         return NEW;

src/main/resources/db/changelog/1-rbac/1058-rbac-generators.sql

@@ -8,26 +8,40 @@
 create or replace procedure rbac.generateRelatedRbacObject(targetTable varchar)
     language plpgsql as $$
 declare
+    targetTableName text;
+    targetSchemaPrefix text;
     createInsertTriggerSQL text;
     createDeleteTriggerSQL text;
 begin
+    if POSITION('.' IN targetTable) > 0 then
+        targetSchemaPrefix := SPLIT_PART(targetTable, '.', 1) || '.';
+        targetTableName := SPLIT_PART(targetTable, '.', 2);
+    else
+        targetSchemaPrefix := '';
+        targetTableName := targetTable;
+    end if;
+
+    if targetSchemaPrefix = '' and targetTableName = 'customer' then
+        raise exception 'missing targetShemaPrefix: %', targetTable;
+    end if;
+
     createInsertTriggerSQL = format($sql$
-        create trigger createRbacObjectFor_%s_Trigger
-            before insert on %s
+        create trigger createRbacObjectFor_%s_insert_tg_1058_25
+            before insert on %s%s
             for each row
                 execute procedure rbac.insert_related_object();
-        $sql$, targetTable, targetTable);
+        $sql$, targetTableName, targetSchemaPrefix, targetTableName);
     execute createInsertTriggerSQL;
 
     createDeleteTriggerSQL = format($sql$
-        create trigger delete_related_rbac_rules_for_%s_tg
-            after delete
-            on %s
+        create trigger createRbacObjectFor_%s_delete_tg_1058_35
+            after delete on %s%s
             for each row
                 execute procedure rbac.delete_related_rbac_rules_tf();
-        $sql$, targetTable, targetTable);
+        $sql$, targetTableName, targetSchemaPrefix, targetTableName);
     execute createDeleteTriggerSQL;
-end; $$;
+end;
+$$;
 --//
 
 
@@ -176,7 +190,7 @@ begin
     */
     sql := format($sql$
         create or replace view %1$s_rv as
-            with accessible_%1$s_uuids as (
+            with accessible_uuids as (
                      with recursive
                           recursive_grants as
                               (select distinct rbac.grants.descendantuuid,
@@ -209,7 +223,7 @@ begin
             )
             select target.*
                 from %1$s as target
-                where target.uuid in (select * from accessible_%1$s_uuids)
+                where target.uuid in (select * from accessible_uuids)
                 order by %2$s;
 
         grant all privileges on %1$s_rv to ${HSADMINNG_POSTGRES_RESTRICTED_USERNAME};
@@ -219,9 +233,9 @@ begin
     /**
         Instead of insert trigger function for the restricted view.
      */
-    newColumns := 'new.' || replace(columnNames, ',', ', new.');
+    newColumns := 'new.' || replace(columnNames, ', ', ', new.');
     sql := format($sql$
-    create or replace function %1$sInsert()
+    create function %1$s_instead_of_insert_tf()
         returns trigger
         language plpgsql as $f$
     declare
@@ -240,11 +254,11 @@ begin
         Creates an instead of insert trigger for the restricted view.
      */
     sql := format($sql$
-        create trigger %1$sInsert_tg
+        create trigger instead_of_insert_tg
             instead of insert
             on %1$s_rv
             for each row
-        execute function %1$sInsert();
+        execute function %1$s_instead_of_insert_tf();
     $sql$, targetTable);
     execute sql;
 
@@ -252,7 +266,7 @@ begin
         Instead of delete trigger function for the restricted view.
      */
     sql := format($sql$
-        create or replace function %1$sDelete()
+        create function %1$s_instead_of_delete_tf()
             returns trigger
             language plpgsql as $f$
         begin
@@ -269,11 +283,11 @@ begin
         Creates an instead of delete trigger for the restricted view.
      */
     sql := format($sql$
-        create trigger %1$sDelete_tg
+        create trigger instead_of_delete_tg
             instead of delete
             on %1$s_rv
             for each row
-        execute function %1$sDelete();
+        execute function %1$s_instead_of_delete_tf();
     $sql$, targetTable);
     execute sql;
 
@@ -283,7 +297,7 @@ begin
      */
     if columnUpdates is not null then
         sql := format($sql$
-            create or replace function %1$sUpdate()
+            create function %1$s_instead_of_update_tf()
                 returns trigger
                 language plpgsql as $f$
             begin
@@ -302,11 +316,11 @@ begin
             Creates an instead of delete trigger for the restricted view.
          */
         sql = format($sql$
-            create trigger %1$sUpdate_tg
+            create trigger instead_of_update_tg
                 instead of update
                 on %1$s_rv
                 for each row
-            execute function %1$sUpdate();
+            execute function %1$s_instead_of_update_tf();
         $sql$, targetTable);
         execute sql;
     end if;

src/main/resources/db/changelog/2-rbactest/200-rbactest-schema.sql

@@ -0,0 +1,8 @@
+--liquibase formatted sql
+
+
+-- ============================================================================
+--changeset michael.hoennig:rbactest-SCHEMA endDelimiter:--//
+-- ----------------------------------------------------------------------------
+CREATE SCHEMA rbactest; -- just 'test' does not work, databasechangelog gets emptied or deleted
+--//

src/main/resources/db/changelog/2-rbactest/201-rbactest-customer/2010-rbactest-customer.sql

@@ -1,7 +1,7 @@
 --liquibase formatted sql
 
 -- ============================================================================
---changeset michael.hoennig:test-customer-MAIN-TABLE endDelimiter:--//
+--changeset michael.hoennig:rbactest-customer-MAIN-TABLE endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 create table if not exists test_customer

src/main/resources/db/changelog/2-rbactest/201-rbactest-customer/2018-rbactest-customer-test-data.sql

@@ -2,7 +2,7 @@
 
 
 -- ============================================================================
---changeset michael.hoennig:test-customer-TEST-DATA-GENERATOR endDelimiter:--//
+--changeset michael.hoennig:rbactest-customer-TEST-DATA-GENERATOR endDelimiter:--//
 -- ----------------------------------------------------------------------------
 /*
     Generates a customer reference number for a given test data counter.
@@ -67,7 +67,7 @@ end; $$;
 
 
 -- ============================================================================
---changeset michael.hoennig:test-customer-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:rbactest-customer-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 do language plpgsql $$

src/main/resources/db/changelog/2-rbactest/202-rbactest-package/2020-rbactest-package.sql

@@ -1,7 +1,7 @@
 --liquibase formatted sql
 
 -- ============================================================================
---changeset michael.hoennig:test-package-MAIN-TABLE endDelimiter:--//
+--changeset michael.hoennig:rbactest-package-MAIN-TABLE endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 create table if not exists test_package

src/main/resources/db/changelog/2-rbactest/202-rbactest-package/2028-rbactest-package-test-data.sql

@@ -1,7 +1,7 @@
 --liquibase formatted sql
 
 -- ============================================================================
---changeset michael.hoennig:test-package-TEST-DATA-GENERATOR endDelimiter:--//
+--changeset michael.hoennig:rbactest-package-TEST-DATA-GENERATOR endDelimiter:--//
 -- ----------------------------------------------------------------------------
 /*
     Creates the given number of test packages for the given customer.
@@ -59,7 +59,7 @@ $$;
 
 
 -- ============================================================================
---changeset michael.hoennig:test-package-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:rbactest-package-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 do language plpgsql $$

src/main/resources/db/changelog/2-rbactest/203-rbactest-domain/2030-rbactest-domain.sql

@@ -1,7 +1,7 @@
 --liquibase formatted sql
 
 -- ============================================================================
---changeset michael.hoennig:test-domain-MAIN-TABLE endDelimiter:--//
+--changeset michael.hoennig:rbactest-domain-MAIN-TABLE endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 create table if not exists test_domain

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -50,23 +50,25 @@ databaseChangeLog:
     - include:
         file: db/changelog/1-rbac/1080-rbac-global.sql
     - include:
-        file: db/changelog/2-test/201-test-customer/2010-test-customer.sql
+        file: db/changelog/2-rbactest/200-rbactest-schema.sql
     - include:
-        file: db/changelog/2-test/201-test-customer/2013-test-customer-rbac.sql
+        file: db/changelog/2-rbactest/201-rbactest-customer/2010-rbactest-customer.sql
     - include:
-        file: db/changelog/2-test/201-test-customer/2018-test-customer-test-data.sql
+        file: db/changelog/2-rbactest/201-rbactest-customer/2013-rbactest-customer-rbac.sql
     - include:
-        file: db/changelog/2-test/202-test-package/2020-test-package.sql
+        file: db/changelog/2-rbactest/201-rbactest-customer/2018-rbactest-customer-test-data.sql
     - include:
-        file: db/changelog/2-test/202-test-package/2023-test-package-rbac.sql
+        file: db/changelog/2-rbactest/202-rbactest-package/2020-rbactest-package.sql
     - include:
-        file: db/changelog/2-test/202-test-package/2028-test-package-test-data.sql
+        file: db/changelog/2-rbactest/202-rbactest-package/2023-rbactest-package-rbac.sql
     - include:
-        file: db/changelog/2-test/203-test-domain/2030-test-domain.sql
+        file: db/changelog/2-rbactest/202-rbactest-package/2028-rbactest-package-test-data.sql
     - include:
-        file: db/changelog/2-test/203-test-domain/2033-test-domain-rbac.sql
+        file: db/changelog/2-rbactest/203-rbactest-domain/2030-rbactest-domain.sql
     - include:
-        file: db/changelog/2-test/203-test-domain/2038-test-domain-test-data.sql
+        file: db/changelog/2-rbactest/203-rbactest-domain/2033-rbactest-domain-rbac.sql
+    - include:
+        file: db/changelog/2-rbactest/203-rbactest-domain/2038-rbactest-domain-test-data.sql
     - include:
         file: db/changelog/5-hs-office/501-contact/5010-hs-office-contact.sql
     - include: