From fd1466c6677703083f0de3dd5e678a317b3cc0e6 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Mon, 12 Feb 2024 16:34:30 +0100 Subject: [PATCH] cleanup --- src/main/resources/db/changelog/010-context.sql | 2 -- .../hsadminng/hs/office/migration/ImportOfficeData.java | 1 - .../HsOfficeRelationshipRepositoryIntegrationTest.java | 4 ---- 3 files changed, 7 deletions(-) diff --git a/src/main/resources/db/changelog/010-context.sql b/src/main/resources/db/changelog/010-context.sql index b388bfd6..4820cf9c 100644 --- a/src/main/resources/db/changelog/010-context.sql +++ b/src/main/resources/db/changelog/010-context.sql @@ -41,8 +41,6 @@ begin assumedRoles := coalesce(assumedRoles, ''); execute format('set local hsadminng.assumedRoles to %L', assumedRoles); - SET CONSTRAINTS ALL DEFERRED; - call contextDefined(currentTask, currentRequest, currentUser, assumedRoles); end; $$; --// diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java index 6aa6e460..53f761df 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java @@ -455,7 +455,6 @@ public class ImportOfficeData extends ContextBasedTest { @Test @Order(3000) @Commit - @Disabled void persistEntities() { System.out.println("PERSISTING to database '" + jdbcUrl + "' as user '" + postgresAdminUser + "'"); diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java index 8b732d66..8d89479c 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java @@ -342,10 +342,6 @@ class HsOfficeRelationshipRepositoryIntegrationTest extends ContextBasedTestWith final var initialGrantNames = Array.from(distinctGrantDisplaysOf(rawGrantRepo.findAll())); final var givenRelationship = givenSomeTemporaryRelationshipBessler( "Anita", "twelfth"); - assertThat(distinctRoleNamesOf(rawRoleRepo.findAll()).size()).as("unexpected number of roles created") - .isEqualTo(initialRoleNames.length + 3); - assertThat(distinctGrantDisplaysOf(rawGrantRepo.findAll()).size()).as("unexpected number of grants created") - .isEqualTo(initialGrantNames.length + 13); // when final var result = jpaAttempt.transacted(() -> {