From faca4196e4eb1c4ae50a713e7a5dca2330427bf4 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Sun, 15 Sep 2024 19:25:22 +0200
Subject: [PATCH] cleanup

---
 sql/historization.sql                                       | 2 +-
 sql/rbac-tests.sql                                          | 2 +-
 src/main/resources/db/changelog/0-base/000-base-schema.sql  | 2 +-
 src/main/resources/db/changelog/0-base/010-context.sql      | 1 +
 src/main/resources/db/changelog/1-rbac/1000-rbac-schema.sql | 2 +-
 src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql | 2 +-
 src/main/resources/db/changelog/2-test/200-test-schema.sql  | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sql/historization.sql b/sql/historization.sql
index 474f05ca..d854f394 100644
--- a/sql/historization.sql
+++ b/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 tx_history_txid(), txc.txtimestamp, txc.currentSubject, txc.currentTask, haex.*
+select base.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';
diff --git a/sql/rbac-tests.sql b/sql/rbac-tests.sql
index bde34d61..1a95add0 100644
--- a/sql/rbac-tests.sql
+++ b/sql/rbac-tests.sql
@@ -33,7 +33,7 @@ $$
         userId uuid;
         result bool;
     BEGIN
-        userId = findRbacSubject('superuser-alex@hostsharing.net');
+        userId = rbac.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';
diff --git a/src/main/resources/db/changelog/0-base/000-base-schema.sql b/src/main/resources/db/changelog/0-base/000-base-schema.sql
index 6a50e2f0..0f66f74c 100644
--- a/src/main/resources/db/changelog/0-base/000-base-schema.sql
+++ b/src/main/resources/db/changelog/0-base/000-base-schema.sql
@@ -4,5 +4,5 @@
 -- ============================================================================
 --changeset base-SCHEMA:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
-CREATE SCHEMA IF NOT EXISTS base;
+CREATE SCHEMA base;
 --//
diff --git a/src/main/resources/db/changelog/0-base/010-context.sql b/src/main/resources/db/changelog/0-base/010-context.sql
index 446f6955..46e9a509 100644
--- a/src/main/resources/db/changelog/0-base/010-context.sql
+++ b/src/main/resources/db/changelog/0-base/010-context.sql
@@ -127,6 +127,7 @@ begin
 end; $$;
 --//
 
+
 -- ============================================================================
 --changeset context-base.ASSUMED-ROLES:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
diff --git a/src/main/resources/db/changelog/1-rbac/1000-rbac-schema.sql b/src/main/resources/db/changelog/1-rbac/1000-rbac-schema.sql
index 35662a3e..14f3ba93 100644
--- a/src/main/resources/db/changelog/1-rbac/1000-rbac-schema.sql
+++ b/src/main/resources/db/changelog/1-rbac/1000-rbac-schema.sql
@@ -4,5 +4,5 @@
 -- ============================================================================
 --changeset rbac-SCHEMA:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
-CREATE SCHEMA IF NOT EXISTS rbac;
+CREATE SCHEMA rbac;
 --//
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 9c6c1b36..bd5128b0 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
@@ -168,7 +168,7 @@ $$;
 
 
 -- ============================================================================
---changeset rbac-global-TEST:1 context:dev,tc runAlways:true endDelimiter:--//
+--changeset rbac-global-TEST:1 context:dev,tc endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
 /*
diff --git a/src/main/resources/db/changelog/2-test/200-test-schema.sql b/src/main/resources/db/changelog/2-test/200-test-schema.sql
index cd083d72..e1d476f5 100644
--- a/src/main/resources/db/changelog/2-test/200-test-schema.sql
+++ b/src/main/resources/db/changelog/2-test/200-test-schema.sql
@@ -4,5 +4,5 @@
 -- ============================================================================
 --changeset test-SCHEMA:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
-CREATE SCHEMA IF NOT EXISTS test;
+CREATE SCHEMA test;
 --//