From 9a22007b499a9a9ead8a6e501c672cdee61bc993 Mon Sep 17 00:00:00 2001 From: Sarah Botwinick Date: Wed, 13 Mar 2024 16:59:50 +0000 Subject: [PATCH 1/2] Remove the shouldPublish field from the reservedLIst entity --- .../java/google/registry/model/tld/label/ReservedList.java | 4 ---- .../registry/tools/server/ListReservedListsActionTest.java | 2 +- gradle.properties | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/google/registry/model/tld/label/ReservedList.java b/core/src/main/java/google/registry/model/tld/label/ReservedList.java index fe63b98c4b6..22568fe77b4 100644 --- a/core/src/main/java/google/registry/model/tld/label/ReservedList.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservedList.java @@ -71,10 +71,6 @@ public final class ReservedList */ @Insignificant @Transient Map reservedListMap; - // TODO(b/321053918): Remove this field once the column is nullable - @Column(nullable = true) - boolean shouldPublish = true; - @PreRemove void preRemove() { tm().query("DELETE FROM ReservedEntry WHERE revision_id = :revisionId") diff --git a/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java b/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java index 19e2d9b132e..100123a919f 100644 --- a/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java +++ b/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java @@ -69,7 +69,7 @@ void testRun_withWildcard() { Optional.of("*"), Optional.empty(), Optional.empty(), - "^name\\s+.*shouldPublish.*", + "^name\\s+.*", "^-+\\s+-+", "^xn--q9jyb4c-private\\s+.*", "^xn--q9jyb4c-published\\s+.*"); diff --git a/gradle.properties b/gradle.properties index 3d8683f27b0..55649a3ed10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -# This file defines properties used by the Gradle build. It must be kept in +# This file defines properties used by the gradle build. It must be kept in # sync with config/nom_build.py. # # To regenerate, run ./nom_build --generate-gradle-properties From 20bb989924e8537c3e59e782f53c572802eca38c Mon Sep 17 00:00:00 2001 From: Sarah Botwinick Date: Wed, 13 Mar 2024 20:17:00 +0000 Subject: [PATCH 2/2] Add generated schema file --- db/src/main/resources/sql/schema/db-schema.sql.generated | 1 - 1 file changed, 1 deletion(-) diff --git a/db/src/main/resources/sql/schema/db-schema.sql.generated b/db/src/main/resources/sql/schema/db-schema.sql.generated index 4f68dfe9225..e44abda3348 100644 --- a/db/src/main/resources/sql/schema/db-schema.sql.generated +++ b/db/src/main/resources/sql/schema/db-schema.sql.generated @@ -693,7 +693,6 @@ revision_id bigserial not null, creation_timestamp timestamptz, name text not null, - should_publish boolean, primary key (revision_id) );