creating a Schema CR instance should require the Database name in which the schema should be created

Author: ThoSap

docs/schema.md

@@ -7,6 +7,7 @@ The `Schema` Custom Resource Definition (CRD) is responsible for managing Postgr
 | Field           | Type               | Description                                                                                        | Required | Immutable |
 |-----------------|--------------------|----------------------------------------------------------------------------------------------------|----------|-----------|
 | `clusterRef`    | `ClusterReference` | Reference to the `ClusterConnection` to use.                                                       | Yes      | No        |
+| `database`      | `string`           | The name of the database in which the schema is created.                                           | Yes      | Yes       |
 | `name`          | `string`           | The name of the schema to create.                                                                  | Yes      | Yes       |
 | `owner`         | `string`           | The owner of the schema.                                                                           | No       | No        |
 | `reclaimPolicy` | `string`           | The policy for reclaiming the schema when the CR is deleted. Values: `Retain` (Default), `Delete`. | No       | No        |
@@ -35,6 +36,7 @@ metadata:
 spec:
   clusterRef:
     name: my-postgres-connection
+  database: my_database
   name: my_schema
   owner: my_role
   reclaimPolicy: Retain

operator/src/main/java/it/aboutbits/postgresql/crd/schema/SchemaReconciler.java

@@ -67,11 +67,12 @@ public UpdateControl<Schema> reconcile(
                     .rescheduleAfter(60, TimeUnit.SECONDS);
         }
 
+        var database = spec.getDatabase();
         var clusterConnection = clusterConnectionOptional.get();
 
         UpdateControl<Schema> updateControl;
 
-        try (var dsl = contextFactory.getDSLContext(clusterConnection)) {
+        try (var dsl = contextFactory.getDSLContext(clusterConnection, database)) {
             // Run everything in a single transaction
             updateControl = dsl.transactionResult(
                     cfg -> reconcileInTransaction(
@@ -149,9 +150,10 @@ public DeleteControl cleanup(
                     .rescheduleAfter(60, TimeUnit.SECONDS);
         }
 
+        var database = spec.getDatabase();
         var clusterConnection = clusterConnectionOptional.get();
 
-        try (var dsl = contextFactory.getDSLContext(clusterConnection)) {
+        try (var dsl = contextFactory.getDSLContext(clusterConnection, database)) {
             schemaService.dropSchema(dsl, spec);
 
             return DeleteControl.defaultDelete();

operator/src/main/java/it/aboutbits/postgresql/crd/schema/SchemaSpec.java

@@ -16,6 +16,17 @@ public class SchemaSpec {
     @Required
     private ClusterReference clusterRef = new ClusterReference();
 
+    @Required
+    @ValidationRule(
+            value = "self == oldSelf",
+            message = "The Schema database is immutable. Moving a schema to another database requires dumping and restoring the schema to the new database."
+    )
+    @ValidationRule(
+            value = "self.trim().size() > 0",
+            message = "The Schema database must not be empty."
+    )
+    private String database = "";
+
     @Required
     @ValidationRule(
             value = "self == oldSelf",

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

@@ -82,6 +82,7 @@ protected ClusterConnection create(int index) {
         );
 
         var spec = new ClusterConnectionSpec();
+
         spec.setHost(getHost());
         spec.setPort(getPort());
         spec.setDatabase(getDatabase());

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

@@ -72,15 +72,16 @@ protected Database create(int index) {
                 .build()
         );
 
-        var spec = new DatabaseSpec();
-        spec.setName(name);
-        spec.setReclaimPolicy(withReclaimPolicy);
-        spec.setOwner(withOwner);
-
         var clusterRef = new ClusterReference();
         clusterRef.setName(getClusterConnectionName());
         clusterRef.setNamespace(withClusterConnectionNamespace);
+
+        var spec = new DatabaseSpec();
+
         spec.setClusterRef(clusterRef);
+        spec.setName(name);
+        spec.setReclaimPolicy(withReclaimPolicy);
+        spec.setOwner(withOwner);
 
         item.setSpec(spec);
 

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

@@ -93,15 +93,15 @@ protected Role create(int index) {
                 .build()
         );
 
-        var spec = new RoleSpec();
-        spec.setName(name);
-        spec.setComment(withComment);
-
         var clusterRef = new ClusterReference();
         clusterRef.setName(getClusterConnectionName());
         clusterRef.setNamespace(withClusterConnectionNamespace);
-        spec.setClusterRef(clusterRef);
 
+        var spec = new RoleSpec();
+
+        spec.setClusterRef(clusterRef);
+        spec.setName(name);
+        spec.setComment(withComment);
         spec.setPasswordSecretRef(withPasswordSecretRef);
 
         if (withFlags != null) {

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

@@ -16,6 +16,8 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static it.aboutbits.postgresql.core.ReclaimPolicy.DELETE;
+
 @NullMarked
 @Setter
 @Accessors(fluent = true, chain = true)
@@ -38,6 +40,9 @@ public class SchemaCreate extends TestDataCreator<Schema> {
     @Nullable
     private String withClusterConnectionNamespace;
 
+    @Nullable
+    private String withDatabase;
+
     private ReclaimPolicy withReclaimPolicy = ReclaimPolicy.RETAIN;
 
     @Nullable
@@ -72,15 +77,20 @@ protected Schema create(int index) {
                 .build()
         );
 
-        var spec = new SchemaSpec();
-        spec.setName(name);
-        spec.setReclaimPolicy(withReclaimPolicy);
-        spec.setOwner(withOwner);
+        // We have to create the database first which also modifies the specified withClusterConnectionName so the connection points to the newly created DB
+        var database = getDatabase();
 
         var clusterRef = new ClusterReference();
         clusterRef.setName(getClusterConnectionName());
         clusterRef.setNamespace(withClusterConnectionNamespace);
+
+        var spec = new SchemaSpec();
+
         spec.setClusterRef(clusterRef);
+        spec.setDatabase(database);
+        spec.setName(name);
+        spec.setReclaimPolicy(withReclaimPolicy);
+        spec.setOwner(withOwner);
 
         item.setSpec(spec);
 
@@ -139,4 +149,30 @@ private String getClusterConnectionName() {
 
         return clusterConnection.getMetadata().getName();
     }
+
+    private String getDatabase() {
+        if (withDatabase != null) {
+            return withDatabase;
+        }
+
+        var item = given.one()
+                .database()
+                .withClusterConnectionName(getClusterConnectionName())
+                .withClusterConnectionNamespace(withClusterConnectionNamespace)
+                .withReclaimPolicy(DELETE)
+                .returnFirst();
+
+        withDatabase = item.getSpec().getName();
+
+        var clusterConnectionDb = given.one()
+                .clusterConnection()
+                .withName(getClusterConnectionName() + "-db")
+                .withNamespace(withClusterConnectionNamespace)
+                .withDatabase(withDatabase)
+                .returnFirst();
+
+        withClusterConnectionName = clusterConnectionDb.getMetadata().getName();
+
+        return withDatabase;
+    }
 }

operator/src/test/java/it/aboutbits/postgresql/crd/schema/SchemaReconcilerTest.java

@@ -39,19 +39,32 @@ void resetEnvironment() {
     @DisplayName("When a Schema is created, it should be reconciled to READY")
     void createSchema_andStatusReady() {
         // given
-        var clusterConnection = given.one()
+        var clusterConnectionMain = given.one()
                 .clusterConnection()
                 .withName("test-connection-schema")
                 .returnFirst();
 
+        var database = given.one()
+                .database()
+                .withClusterConnectionName(clusterConnectionMain.getMetadata().getName())
+                .returnFirst();
+
+        // Creating a second ClusterConnection CR is only required for the tests
+        var clusterConnectionDb = given.one()
+                .clusterConnection()
+                .withName("test-connection-schema-db")
+                .withDatabase(database.getSpec().getName())
+                .returnFirst();
+
         var now = OffsetDateTime.now(ZoneOffset.UTC);
         var schemaName = "test-schema";
 
         // when
         var schema = given.one()
                 .schema()
+                .withDatabase(database.getName())
                 .withName(schemaName)
-                .withClusterConnectionName(clusterConnection.getMetadata().getName())
+                .withClusterConnectionName(clusterConnectionDb.getMetadata().getName())
                 .withReclaimPolicy(DELETE)
                 .returnFirst();
 
@@ -67,7 +80,7 @@ void createSchema_andStatusReady() {
                 now
         );
 
-        var dsl = postgreSQLContextFactory.getDSLContext(clusterConnection);
+        var dsl = postgreSQLContextFactory.getDSLContext(clusterConnectionDb);
 
         assertThat(schemaService.schemaExists(dsl, schema.getSpec())).isTrue();
     }