mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-03 11:45:39 +00:00
Code Issues Releases 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 1a63d50b82
commit 798879d031
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;
/** 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;
/**

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

@@ -37,6 +37,8 @@
premium_list_name text,
pricing_engine_class_name text,
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_grace_period_length interval 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,
pricing_engine_class_name text,
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_grace_period_length interval 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,
pricing_engine_class_name text,
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_grace_period_length interval NOT NULL,
reserved_list_names text[] NOT NULL,