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 f9796691a..b5ad2f174 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,11 +261,11 @@ td.section {
| generated on |
- 2022-05-31 20:52:17.926893 |
+ 2022-06-01 19:28:09.351103 |
| last flyway file |
- V117__add_billing_recurrence_last_expansion_column.sql |
+ V118__drop_billing_identifier_column_from_registrar.sql |
@@ -284,7 +284,7 @@ td.section {
generated on
- 2022-05-31 20:52:17.926893
+ 2022-06-01 19:28:09.351103
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 3dcc1ab15..d97e9c574 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,11 +261,11 @@ td.section {
| generated on |
- 2022-05-31 20:52:16.531047 |
+ 2022-06-01 19:28:07.459496 |
| last flyway file |
- V117__add_billing_recurrence_last_expansion_column.sql |
+ V118__drop_billing_identifier_column_from_registrar.sql |
@@ -284,7 +284,7 @@ td.section {
generated on
- 2022-05-31 20:52:16.531047
+ 2022-06-01 19:28:07.459496
@@ -1360,23 +1360,23 @@ td.section {
"hstore"
- billing_identifier
+ block_premium_names
- int8
+ bool not null
- block_premium_names
+ client_certificate
- bool not null
+ text
- client_certificate
+ client_certificate_hash
@@ -1384,31 +1384,31 @@ td.section {
text
- client_certificate_hash
+ contacts_require_syncing
- text
+ bool not null
- contacts_require_syncing
+ creation_time
- bool not null
+ timestamptz not null
- creation_time
+ drive_folder_id
- timestamptz not null
+ text
- drive_folder_id
+ email_address
@@ -1416,7 +1416,7 @@ td.section {
text
- email_address
+ failover_client_certificate
@@ -1424,7 +1424,7 @@ td.section {
text
- failover_client_certificate
+ failover_client_certificate_hash
@@ -1432,7 +1432,7 @@ td.section {
text
- failover_client_certificate_hash
+ fax_number
@@ -1440,23 +1440,23 @@ td.section {
text
- fax_number
+ iana_identifier
- text
+ int8
- iana_identifier
+ icann_referral_email
- int8
+ text
- icann_referral_email
+ i18n_address_city
@@ -1464,7 +1464,7 @@ td.section {
text
- i18n_address_city
+ i18n_address_country_code
@@ -1472,7 +1472,7 @@ td.section {
text
- i18n_address_country_code
+ i18n_address_state
@@ -1480,7 +1480,7 @@ td.section {
text
- i18n_address_state
+ i18n_address_street_line1
@@ -1488,7 +1488,7 @@ td.section {
text
- i18n_address_street_line1
+ i18n_address_street_line2
@@ -1496,7 +1496,7 @@ td.section {
text
- i18n_address_street_line2
+ i18n_address_street_line3
@@ -1504,7 +1504,7 @@ td.section {
text
- i18n_address_street_line3
+ i18n_address_zip
@@ -1512,39 +1512,39 @@ td.section {
text
- i18n_address_zip
+ ip_address_allow_list
- text
+ _text
- ip_address_allow_list
+ last_certificate_update_time
- _text
+ timestamptz
- last_certificate_update_time
+ last_update_time
- timestamptz
+ timestamptz not null
- last_update_time
+ localized_address_city
- timestamptz not null
+ text
- localized_address_city
+ localized_address_country_code
@@ -1552,7 +1552,7 @@ td.section {
text
- localized_address_country_code
+ localized_address_state
@@ -1560,7 +1560,7 @@ td.section {
text
- localized_address_state
+ localized_address_street_line1
@@ -1568,7 +1568,7 @@ td.section {
text
- localized_address_street_line1
+ localized_address_street_line2
@@ -1576,7 +1576,7 @@ td.section {
text
- localized_address_street_line2
+ localized_address_street_line3
@@ -1584,7 +1584,7 @@ td.section {
text
- localized_address_street_line3
+ localized_address_zip
@@ -1592,7 +1592,7 @@ td.section {
text
- localized_address_zip
+ password_hash
@@ -1600,7 +1600,7 @@ td.section {
text
- password_hash
+ phone_number
@@ -1608,7 +1608,7 @@ td.section {
text
- phone_number
+ phone_passcode
@@ -1616,7 +1616,7 @@ td.section {
text
- phone_passcode
+ po_number
@@ -1624,39 +1624,39 @@ td.section {
text
- po_number
+ rdap_base_urls
- text
+ _text
- rdap_base_urls
+ registrar_name
- _text
+ text not null
- registrar_name
+ registry_lock_allowed
- text not null
+ bool not null
- registry_lock_allowed
+ password_salt
- bool not null
+ text
- password_salt
+ state
@@ -1664,23 +1664,23 @@ td.section {
text
- state
+ type
- text
+ text not null
- type
+ url
- text not null
+ text
- url
+ whois_server
@@ -1688,30 +1688,22 @@ td.section {
text
- whois_server
+ last_expiring_cert_notification_sent_date
- text
+ timestamptz
- last_expiring_cert_notification_sent_date
+ last_expiring_failover_cert_notification_sent_date
timestamptz
-
- last_expiring_failover_cert_notification_sent_date
-
-
-
-
- timestamptz
-
-
+
billingevent_a57d1815:w->registrar_6e1503e3:e
@@ -12474,11 +12466,6 @@ td.section {
billing_account_map |
"hstore" |
-
- |
- billing_identifier |
- int8 |
-
|
block_premium_names |
diff --git a/db/src/main/resources/sql/flyway.txt b/db/src/main/resources/sql/flyway.txt
index bcac1e4c6..fd8f42c37 100644
--- a/db/src/main/resources/sql/flyway.txt
+++ b/db/src/main/resources/sql/flyway.txt
@@ -115,3 +115,4 @@ V114__add_allocation_token_indexes.sql
V115__add_renewal_columns_to_billing_recurrence.sql
V116__add_renewal_column_to_allocation_token.sql
V117__add_billing_recurrence_last_expansion_column.sql
+V118__drop_billing_identifier_column_from_registrar.sql
diff --git a/db/src/main/resources/sql/flyway/V118__drop_billing_identifier_column_from_registrar.sql b/db/src/main/resources/sql/flyway/V118__drop_billing_identifier_column_from_registrar.sql
new file mode 100644
index 000000000..fcf06c255
--- /dev/null
+++ b/db/src/main/resources/sql/flyway/V118__drop_billing_identifier_column_from_registrar.sql
@@ -0,0 +1,15 @@
+-- Copyright 2022 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+alter table "Registrar" drop column billing_identifier;
diff --git a/db/src/main/resources/sql/schema/nomulus.golden.sql b/db/src/main/resources/sql/schema/nomulus.golden.sql
index 47cbea6f5..944f1b645 100644
--- a/db/src/main/resources/sql/schema/nomulus.golden.sql
+++ b/db/src/main/resources/sql/schema/nomulus.golden.sql
@@ -764,7 +764,6 @@ CREATE TABLE public."Registrar" (
registrar_id text NOT NULL,
allowed_tlds text[],
billing_account_map public.hstore,
- billing_identifier bigint,
block_premium_names boolean NOT NULL,
client_certificate text,
client_certificate_hash text,