diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacRestrictedViewGenerator.java b/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacRestrictedViewGenerator.java index 0a6d23ac..f0bd50a0 100644 --- a/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacRestrictedViewGenerator.java +++ b/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacRestrictedViewGenerator.java @@ -23,16 +23,16 @@ public class RbacRestrictedViewGenerator { -- ---------------------------------------------------------------------------- call generateRbacRestrictedView('${rawTableName}', $orderBy$ - ${orderBy} + ${orderBy} $orderBy$, $updates$ - ${updates} + ${updates} $updates$); --// """, with("liquibaseTagPrefix", liquibaseTagPrefix), - with("orderBy", rbacDef.getOrderBySqlExpression().sql), + with("orderBy", indented(rbacDef.getOrderBySqlExpression().sql, 2)), with("updates", indented(rbacDef.getUpdatableColumns().stream() .map(c -> c + " = new." + c) .collect(joining(",\n")), 2)), diff --git a/src/main/resources/db/changelog/113-test-customer-rbac.md b/src/main/resources/db/changelog/113-test-customer-rbac.md index 997c5e97..438b6254 100644 --- a/src/main/resources/db/changelog/113-test-customer-rbac.md +++ b/src/main/resources/db/changelog/113-test-customer-rbac.md @@ -1,6 +1,6 @@ ### rbac customer -This code generated was by RbacViewMermaidFlowchartGenerator at 2024-03-22T14:02:48.041634681. +This code generated was by RbacViewMermaidFlowchartGenerator at 2024-03-22T14:44:19.425403022. ```mermaid %%{init:{'flowchart':{'htmlLabels':false}}}%% diff --git a/src/main/resources/db/changelog/113-test-customer-rbac.sql b/src/main/resources/db/changelog/113-test-customer-rbac.sql index 9472f71e..dccb3a26 100644 --- a/src/main/resources/db/changelog/113-test-customer-rbac.sql +++ b/src/main/resources/db/changelog/113-test-customer-rbac.sql @@ -1,5 +1,5 @@ --liquibase formatted sql --- This code generated was by RbacViewPostgresGenerator at 2024-03-22T14:02:48.059763974. +-- This code generated was by RbacViewPostgresGenerator at 2024-03-22T14:44:19.441879428. -- ============================================================================ @@ -116,7 +116,7 @@ call generateRbacRestrictedView('test_customer', reference $orderBy$, $updates$ - reference = new.reference, + reference = new.reference, prefix = new.prefix, adminUserName = new.adminUserName $updates$); diff --git a/src/main/resources/db/changelog/123-test-package-rbac.md b/src/main/resources/db/changelog/123-test-package-rbac.md index b4281d6d..895d3269 100644 --- a/src/main/resources/db/changelog/123-test-package-rbac.md +++ b/src/main/resources/db/changelog/123-test-package-rbac.md @@ -1,6 +1,6 @@ ### rbac package -This code generated was by RbacViewMermaidFlowchartGenerator at 2024-03-22T14:02:48.107522933. +This code generated was by RbacViewMermaidFlowchartGenerator at 2024-03-22T14:44:19.484173294. ```mermaid %%{init:{'flowchart':{'htmlLabels':false}}}%% diff --git a/src/main/resources/db/changelog/123-test-package-rbac.sql b/src/main/resources/db/changelog/123-test-package-rbac.sql index 26a2d1af..fd375e2d 100644 --- a/src/main/resources/db/changelog/123-test-package-rbac.sql +++ b/src/main/resources/db/changelog/123-test-package-rbac.sql @@ -1,5 +1,5 @@ --liquibase formatted sql --- This code generated was by RbacViewPostgresGenerator at 2024-03-22T14:02:48.108087056. +-- This code generated was by RbacViewPostgresGenerator at 2024-03-22T14:44:19.484728385. -- ============================================================================ @@ -231,7 +231,7 @@ call generateRbacRestrictedView('test_package', name $orderBy$, $updates$ - version = new.version, + version = new.version, customerUuid = new.customerUuid, description = new.description $updates$); diff --git a/src/main/resources/db/changelog/133-test-domain-rbac.md b/src/main/resources/db/changelog/133-test-domain-rbac.md index f856c2f7..4f507312 100644 --- a/src/main/resources/db/changelog/133-test-domain-rbac.md +++ b/src/main/resources/db/changelog/133-test-domain-rbac.md @@ -1,6 +1,6 @@ ### rbac domain -This code generated was by RbacViewMermaidFlowchartGenerator at 2024-03-22T14:02:48.134524089. +This code generated was by RbacViewMermaidFlowchartGenerator at 2024-03-22T14:44:19.510830235. ```mermaid %%{init:{'flowchart':{'htmlLabels':false}}}%% diff --git a/src/main/resources/db/changelog/133-test-domain-rbac.sql b/src/main/resources/db/changelog/133-test-domain-rbac.sql index c98a9bb4..511b2de4 100644 --- a/src/main/resources/db/changelog/133-test-domain-rbac.sql +++ b/src/main/resources/db/changelog/133-test-domain-rbac.sql @@ -1,5 +1,5 @@ --liquibase formatted sql --- This code generated was by RbacViewPostgresGenerator at 2024-03-22T14:02:48.134964758. +-- This code generated was by RbacViewPostgresGenerator at 2024-03-22T14:44:19.511320177. -- ============================================================================ @@ -230,7 +230,7 @@ call generateRbacRestrictedView('test_domain', name $orderBy$, $updates$ - version = new.version, + version = new.version, packageUuid = new.packageUuid, description = new.description $updates$);