zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-23 04:39:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix semantic merge conflict in Registry (#810)

Browse source 
* Fix semantic merge conflict in Registry
This commit is contained in:
gbrodman 2020-09-18 14:40:11 -04:00 • committed by GitHub
parent c237ba0456
commit 89a9190d14
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/google/registry/model/registry/Registry.java
View file

@ -480,6 +480,14 @@ public class Registry extends ImmutableObject implements Buildable {
Money serverStatusChangeBillingCost = DEFAULT_SERVER_STATUS_CHANGE_BILLING_COST; Money serverStatusChangeBillingCost = DEFAULT_SERVER_STATUS_CHANGE_BILLING_COST;
/** The one-time billing cost for a registry lock/unlock action initiated by a registrar. */ /** The one-time billing cost for a registry lock/unlock action initiated by a registrar. */
@AttributeOverrides({
@AttributeOverride(
name = "money.amount",
column = @Column(name = "registry_lock_or_unlock_cost_amount")),
@AttributeOverride(
name = "money.currency",
column = @Column(name = "registry_lock_or_unlock_cost_currency"))
})
Money registryLockOrUnlockBillingCost = DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST; Money registryLockOrUnlockBillingCost = DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST;
/** /**

2
db/src/main/resources/sql/flyway/V54__add_tld_table.sql
View file

@ -37,6 +37,8 @@
premium_list_name text, premium_list_name text,
pricing_engine_class_name text, pricing_engine_class_name text,
redemption_grace_period_length interval not null, redemption_grace_period_length interval not null,
registry_lock_or_unlock_cost_amount numeric(19, 2),
registry_lock_or_unlock_cost_currency text,
renew_billing_cost_transitions hstore not null, renew_billing_cost_transitions hstore not null,
renew_grace_period_length interval not null, renew_grace_period_length interval not null,
reserved_list_names text[] not null, reserved_list_names text[] not null,

2
db/src/main/resources/sql/schema/db-schema.sql.generated
View file

@ -605,6 +605,8 @@ create sequence temp_history_id_sequence start 1 increment 50;
premium_list_name text, premium_list_name text,
pricing_engine_class_name text, pricing_engine_class_name text,
redemption_grace_period_length interval not null, redemption_grace_period_length interval not null,
registry_lock_or_unlock_cost_amount numeric(19, 2),
registry_lock_or_unlock_cost_currency text,
renew_billing_cost_transitions hstore not null, renew_billing_cost_transitions hstore not null,
renew_grace_period_length interval not null, renew_grace_period_length interval not null,
reserved_list_names text[] not null, reserved_list_names text[] not null,

2
db/src/main/resources/sql/schema/nomulus.golden.sql
View file

@ -918,6 +918,8 @@ CREATE TABLE public."Tld" (
premium_list_name text, premium_list_name text,
pricing_engine_class_name text, pricing_engine_class_name text,
redemption_grace_period_length interval NOT NULL, redemption_grace_period_length interval NOT NULL,
registry_lock_or_unlock_cost_amount numeric(19,2),
registry_lock_or_unlock_cost_currency text,
renew_billing_cost_transitions public.hstore NOT NULL, renew_billing_cost_transitions public.hstore NOT NULL,
renew_grace_period_length interval NOT NULL, renew_grace_period_length interval NOT NULL,
reserved_list_names text[] NOT NULL, reserved_list_names text[] NOT NULL,