sql/historization.sql

@@ -28,7 +28,7 @@ commit;
 set hsadminng.tx_history_txid to '';
 set hsadminng.tx_history_timestamp to '2024-08-29 12:42';
 -- all versions
-select base.tx_history_txid(), txc.txtimestamp, txc.currentSubject, txc.currentTask, haex.*
+select tx_history_txid(), txc.txtimestamp, txc.currentSubject, txc.currentTask, haex.*
     from hs_hosting_asset_ex haex
              join base.tx_context txc on haex.txid=txc.txid
     where haex.identifier = 'test@thi.example.org';

sql/rbac-tests.sql

@@ -33,7 +33,7 @@ $$
         userId uuid;
         result bool;
     BEGIN
-        userId = rbac.findRbacSubject('superuser-alex@hostsharing.net');
+        userId = findRbacSubject('superuser-alex@hostsharing.net');
         result = (SELECT * FROM rbac.isPermissionGrantedToSubject(rbac.findPermissionId('package', 94928, 'add-package'), userId));
         IF (result) THEN
             RAISE EXCEPTION 'expected permission NOT to be granted, but it is';

src/main/resources/db/changelog/0-base/000-base-schema.sql

@@ -4,5 +4,5 @@
 -- ============================================================================
 --changeset base-SCHEMA:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
-CREATE SCHEMA base;
+CREATE SCHEMA IF NOT EXISTS base;
 --//

src/main/resources/db/changelog/0-base/010-context.sql

@@ -127,7 +127,6 @@ begin
 end; $$;
 --//
 
-
 -- ============================================================================
 --changeset context-base.ASSUMED-ROLES:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------

src/main/resources/db/changelog/1-rbac/1000-rbac-schema.sql

@@ -4,5 +4,5 @@
 -- ============================================================================
 --changeset rbac-SCHEMA:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
-CREATE SCHEMA rbac;
+CREATE SCHEMA IF NOT EXISTS rbac;
 --//

src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql

@@ -168,7 +168,7 @@ $$;
 
 
 -- ============================================================================
---changeset rbac-global-TEST:1 context:dev,tc endDelimiter:--//
+--changeset rbac-global-TEST:1 context:dev,tc runAlways:true endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 /*

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

@@ -4,5 +4,5 @@
 -- ============================================================================
 --changeset test-SCHEMA:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
-CREATE SCHEMA test;
+CREATE SCHEMA IF NOT EXISTS test;
 --//

src/test/java/net/hostsharing/hsadminng/rbac/context/ContextBasedTest.java

@@ -6,13 +6,11 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import java.sql.Timestamp;
 
-@DirtiesContext
 @Import(RbacGrantsDiagramService.class)
 public abstract class ContextBasedTest {