diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index 2aabaf05d..efb71ff1d 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -62,7 +62,6 @@ import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; -import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Mapify; @@ -76,7 +75,6 @@ import google.registry.model.JsonMapBuilder; import google.registry.model.Jsonifiable; import google.registry.model.UnsafeSerializable; import google.registry.model.UpdateAutoTimestamp; -import google.registry.model.annotations.DeleteAfterMigration; import google.registry.model.annotations.InCrossTld; import google.registry.model.annotations.ReportedOn; import google.registry.model.common.EntityGroupRoot; @@ -389,10 +387,6 @@ public class Registrar extends ImmutableObject */ @Index @Nullable Long ianaIdentifier; - /** Identifier of registrar used in external billing system (e.g. Oracle). */ - // TODO(sarahbot@): Drop this column from the table in a flyway script in a follow up PR. - @DeleteAfterMigration @Nullable @Deprecated @Ignore Long billingIdentifier; - /** Purchase Order number used for invoices in external billing system, if applicable. */ @Nullable String poNumber; diff --git a/db/src/main/resources/sql/er_diagram/brief_er_diagram.html b/db/src/main/resources/sql/er_diagram/brief_er_diagram.html index 374862e7b..32fa6948f 100644 --- a/db/src/main/resources/sql/er_diagram/brief_er_diagram.html +++ b/db/src/main/resources/sql/er_diagram/brief_er_diagram.html @@ -261,7 +261,7 @@ td.section { generated on - 2022-05-05 16:42:10.390681 + 2022-05-23 16:42:00.648335 last flyway file @@ -284,7 +284,7 @@ td.section { generated on - 2022-05-05 16:42:10.390681 + 2022-05-23 16:42:00.648335 diff --git a/db/src/main/resources/sql/er_diagram/full_er_diagram.html b/db/src/main/resources/sql/er_diagram/full_er_diagram.html index 9c215c645..3329b38a9 100644 --- a/db/src/main/resources/sql/er_diagram/full_er_diagram.html +++ b/db/src/main/resources/sql/er_diagram/full_er_diagram.html @@ -261,7 +261,7 @@ td.section { generated on - 2022-05-05 16:42:08.300052 + 2022-05-23 16:41:58.740617 last flyway file @@ -284,7 +284,7 @@ td.section { generated on - 2022-05-05 16:42:08.300052 + 2022-05-23 16:41:58.740617 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 78f851e86..b88470055 100644 --- a/db/src/main/resources/sql/schema/db-schema.sql.generated +++ b/db/src/main/resources/sql/schema/db-schema.sql.generated @@ -572,7 +572,6 @@ registrar_id text not null, allowed_tlds text[], billing_account_map hstore, - billing_identifier int8, block_premium_names boolean not null, client_certificate text, client_certificate_hash text,