fix failing tests which depend on SchemaCreate

Author: ThoSap

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/persisted/creator/DefaultPrivilegeCreate.java

@@ -234,29 +234,11 @@ private String getSchema() {
             return withSchema;
         }
 
-        var databaseName = getDatabase();
-        if (databaseName.isBlank()) {
-            databaseName = given.one()
-                    .database()
-                    .withClusterConnectionName(getClusterConnectionName())
-                    .withClusterConnectionNamespace(withClusterConnectionNamespace)
-                    .withReclaimPolicy(DELETE)
-                    .returnFirst()
-                    .getSpec()
-                    .getName();
-        }
-
-        var clusterConnectionDb = given.one()
-                .clusterConnection()
-                .withName(getClusterConnectionName() + "-db")
-                .withNamespace(withClusterConnectionNamespace)
-                .withDatabase(databaseName)
-                .returnFirst();
-
         var item = given.one()
                 .schema()
-                .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
-                .withClusterConnectionNamespace(clusterConnectionDb.getMetadata().getNamespace())
+                .withClusterConnectionName(getClusterConnectionName())
+                .withClusterConnectionNamespace(withClusterConnectionNamespace)
+                .withDatabase(getDatabase())
                 .withReclaimPolicy(DELETE)
                 .returnFirst();
 

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/persisted/creator/GrantCreate.java

@@ -236,9 +236,9 @@ private String getSchema() {
             return withSchema;
         }
 
-        var databaseName = getDatabase();
-        if (databaseName.isBlank()) {
-            databaseName = given.one()
+        var database = getDatabase();
+        if (database.isBlank()) {
+            database = given.one()
                     .database()
                     .withClusterConnectionName(getClusterConnectionName())
                     .withClusterConnectionNamespace(withClusterConnectionNamespace)
@@ -248,17 +248,11 @@ private String getSchema() {
                     .getName();
         }
 
-        var clusterConnectionDb = given.one()
-                .clusterConnection()
-                .withName(getClusterConnectionName() + "-db")
-                .withNamespace(withClusterConnectionNamespace)
-                .withDatabase(databaseName)
-                .returnFirst();
-
         var item = given.one()
                 .schema()
-                .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
-                .withClusterConnectionNamespace(clusterConnectionDb.getMetadata().getNamespace())
+                .withClusterConnectionName(getClusterConnectionName())
+                .withClusterConnectionNamespace(withClusterConnectionNamespace)
+                .withDatabase(database)
                 .withReclaimPolicy(DELETE)
                 .returnFirst();
 

operator/src/test/java/it/aboutbits/postgresql/crd/defaultprivilege/DefaultPrivilegeReconcilerTest.java

@@ -497,6 +497,7 @@ void defaultPrivilegeOnTable(
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();
 
@@ -623,6 +624,7 @@ void defaultPrivilegeOnSequence() {
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();
 

operator/src/test/java/it/aboutbits/postgresql/crd/grant/GrantReconcilerTest.java

@@ -505,6 +505,7 @@ void grantOnSchema() {
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();
 
@@ -627,6 +628,7 @@ void grantOnTable(
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();
 
@@ -762,6 +764,7 @@ void grantOnAllTables(
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();
 
@@ -945,6 +948,7 @@ void grantOnSequence() {
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();
 
@@ -1078,6 +1082,7 @@ void grantOnAllSequences() {
             var schema = given.one()
                     .schema()
                     .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
+                    .withDatabase(database.getSpec().getName())
                     .withReclaimPolicy(DELETE)
                     .returnFirst();