Add additional constructors to the Constraint

mfvanek · Dec 8, 2024 · ff072fb · ff072fb
1 parent 1db5995
commit ff072fb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/...c/test/java/io/github/mfvanek/pg/core/checks/host/NotValidConstraintsCheckOnHostTest.java b/...c/test/java/io/github/mfvanek/pg/core/checks/host/NotValidConstraintsCheckOnHostTest.java
@@ -48,8 +48,8 @@ void onDatabaseWithThem(final String schemaName) {
             Assertions.assertThat(notValidConstraints)
                 .hasSize(2)
                 .containsExactly(
-                    Constraint.ofType(ctx.enrichWithSchema("accounts"), "c_accounts_chk_client_id_not_validated_yet", ConstraintType.CHECK),
-                    Constraint.ofType(ctx.enrichWithSchema("accounts"), "c_accounts_fk_client_id_not_validated_yet", ConstraintType.FOREIGN_KEY));
+                    Constraint.ofType(ctx, "accounts", "c_accounts_chk_client_id_not_validated_yet", ConstraintType.CHECK),
+                    Constraint.ofType(ctx, "accounts", "c_accounts_fk_client_id_not_validated_yet", ConstraintType.FOREIGN_KEY));
 
             assertThat(check)
                 .executing(ctx, SkipTablesByNamePredicate.ofName(ctx, "accounts"))

diff --git a/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/Constraint.java b/pg-index-health-model/src/main/java/io/github/mfvanek/pg/model/constraint/Constraint.java
@@ -10,6 +10,7 @@
 
 package io.github.mfvanek.pg.model.constraint;
 
+import io.github.mfvanek.pg.model.context.PgContext;
 import io.github.mfvanek.pg.model.dbobject.DbObject;
 import io.github.mfvanek.pg.model.dbobject.PgObjectType;
 import io.github.mfvanek.pg.model.table.TableNameAware;
@@ -170,4 +171,22 @@ public static Constraint ofType(@Nonnull final String tableName,
                                     @Nonnull final ConstraintType constraintType) {
         return new Constraint(tableName, constraintName, constraintType);
     }
+
+    /**
+     * Constructs a {@code Constraint} object with given {@code ConstraintType} and context.
+     *
+     * @param pgContext      the schema context to enrich table name; must be non-null.
+     * @param tableName      table name; should be non-blank.
+     * @param constraintName constraint name; should be non-blank.
+     * @param constraintType constraint type; should be non-null.
+     * @return {@code Constraint}
+     * @since 0.14.3
+     */
+    @Nonnull
+    public static Constraint ofType(@Nonnull final PgContext pgContext,
+                                    @Nonnull final String tableName,
+                                    @Nonnull final String constraintName,
+                                    @Nonnull final ConstraintType constraintType) {
+        return ofType(PgContext.enrichWith(tableName, pgContext), constraintName, constraintType);
+    }
 }
diff --git a/...ndex-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ConstraintTest.java b/...ndex-health-model/src/test/java/io/github/mfvanek/pg/model/constraint/ConstraintTest.java
@@ -10,6 +10,7 @@
 
 package io.github.mfvanek.pg.model.constraint;
 
+import io.github.mfvanek.pg.model.context.PgContext;
 import io.github.mfvanek.pg.model.dbobject.PgObjectType;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;
@@ -21,13 +22,16 @@ class ConstraintTest {
 
     @Test
     void testToString() {
-        final Constraint constraintWithCheck = Constraint.ofType("t", "not_valid_id", ConstraintType.CHECK);
-        assertThat(constraintWithCheck)
+        final PgContext ctx = PgContext.of("tst");
+        assertThat(Constraint.ofType("t", "not_valid_id", ConstraintType.CHECK))
             .hasToString("Constraint{tableName='t', constraintName='not_valid_id', constraintType=CHECK}");
+        assertThat(Constraint.ofType(ctx, "t", "not_valid_id", ConstraintType.CHECK))
+            .hasToString("Constraint{tableName='tst.t', constraintName='not_valid_id', constraintType=CHECK}");
 
-        final Constraint constraintWithForeignKey = Constraint.ofType("t", "not_valid_id", ConstraintType.FOREIGN_KEY);
-        assertThat(constraintWithForeignKey)
+        assertThat(Constraint.ofType("t", "not_valid_id", ConstraintType.FOREIGN_KEY))
             .hasToString("Constraint{tableName='t', constraintName='not_valid_id', constraintType=FOREIGN_KEY}");
+        assertThat(Constraint.ofType(ctx, "t1", "not_valid_id", ConstraintType.FOREIGN_KEY))
+            .hasToString("Constraint{tableName='tst.t1', constraintName='not_valid_id', constraintType=FOREIGN_KEY}");
     }
 
     @Test

diff --git a/...ava/io/github/mfvanek/pg/health/checks/cluster/NotValidConstraintsCheckOnClusterTest.java b/...ava/io/github/mfvanek/pg/health/checks/cluster/NotValidConstraintsCheckOnClusterTest.java
@@ -47,8 +47,8 @@ void onDatabaseWithThem(final String schemaName) {
             Assertions.assertThat(notValidConstraints)
                 .hasSize(2)
                 .containsExactly(
-                    Constraint.ofType(ctx.enrichWithSchema("accounts"), "c_accounts_chk_client_id_not_validated_yet", ConstraintType.CHECK),
-                    Constraint.ofType(ctx.enrichWithSchema("accounts"), "c_accounts_fk_client_id_not_validated_yet", ConstraintType.FOREIGN_KEY));
+                    Constraint.ofType(ctx, "accounts", "c_accounts_chk_client_id_not_validated_yet", ConstraintType.CHECK),
+                    Constraint.ofType(ctx, "accounts", "c_accounts_fk_client_id_not_validated_yet", ConstraintType.FOREIGN_KEY));
 
             assertThat(check)
                 .executing(ctx, SkipTablesByNamePredicate.ofName(ctx, "accounts"))