zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-12 23:44:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename a V40 flyway file to V41 to resolve conflict (#719)

Browse source
This commit is contained in:
Shicong Huang 2020-07-27 15:16:01 -04:00 • committed by GitHub
parent 33c20a6017
commit 8ab83ed4b3
3 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java
View file

@ -63,7 +63,7 @@ public class DomainBaseUtilTest {
private DomainBase domain; private DomainBase domain;
private Entity domainEntity; private Entity domainEntity;
private Key<OneTime> oneTimeBillKey; private Key<OneTime> oneTimeBillKey;
private Key<BillingEvent.Recurring> recurringBillKey; private VKey<BillingEvent.Recurring> recurringBillKey;
private Key<DomainBase> domainKey; private Key<DomainBase> domainKey;
@RegisterExtension @RegisterExtension
@ -102,11 +102,11 @@ public class DomainBaseUtilTest {
Key<HistoryEntry> historyEntryKey = Key<HistoryEntry> historyEntryKey =
Key.create(persistResource(new HistoryEntry.Builder().setParent(domainKey).build())); Key.create(persistResource(new HistoryEntry.Builder().setParent(domainKey).build()));
oneTimeBillKey = Key.create(historyEntryKey, BillingEvent.OneTime.class, 1); oneTimeBillKey = Key.create(historyEntryKey, BillingEvent.OneTime.class, 1);
recurringBillKey = Key.create(historyEntryKey, BillingEvent.Recurring.class, 2); recurringBillKey = VKey.from(Key.create(historyEntryKey, BillingEvent.Recurring.class, 2));
Key<PollMessage.Autorenew> autorenewPollKey = VKey<PollMessage.Autorenew> autorenewPollKey =
Key.create(historyEntryKey, PollMessage.Autorenew.class, 3); VKey.from(Key.create(historyEntryKey, PollMessage.Autorenew.class, 3));
Key<PollMessage.OneTime> onetimePollKey = VKey<PollMessage.OneTime> onetimePollKey =
Key.create(historyEntryKey, PollMessage.OneTime.class, 1); VKey.from(Key.create(historyEntryKey, PollMessage.OneTime.class, 1));
// Set up a new persisted domain entity. // Set up a new persisted domain entity.
domain = domain =
persistResource( persistResource(
@ -146,12 +146,10 @@ public class DomainBaseUtilTest {
.setPendingTransferExpirationTime(fakeClock.nowUtc()) .setPendingTransferExpirationTime(fakeClock.nowUtc())
.setServerApproveEntities( .setServerApproveEntities(
ImmutableSet.of( ImmutableSet.of(
VKey.from(oneTimeBillKey), VKey.from(oneTimeBillKey), recurringBillKey, autorenewPollKey))
VKey.from(recurringBillKey),
VKey.from(autorenewPollKey)))
.setServerApproveBillingEvent(VKey.from(oneTimeBillKey)) .setServerApproveBillingEvent(VKey.from(oneTimeBillKey))
.setServerApproveAutorenewEvent(VKey.from(recurringBillKey)) .setServerApproveAutorenewEvent(recurringBillKey)
.setServerApproveAutorenewPollMessage(VKey.from(autorenewPollKey)) .setServerApproveAutorenewPollMessage(autorenewPollKey)
.setTransferRequestTime(fakeClock.nowUtc().plusDays(1)) .setTransferRequestTime(fakeClock.nowUtc().plusDays(1))
.setTransferStatus(TransferStatus.SERVER_APPROVED) .setTransferStatus(TransferStatus.SERVER_APPROVED)
.setTransferRequestTrid(Trid.create("client-trid", "server-trid")) .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))

20
core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java
View file

@ -156,12 +156,12 @@ class InitSqlPipelineTest {
Key<HistoryEntry> historyEntryKey = Key.create(historyEntry); Key<HistoryEntry> historyEntryKey = Key.create(historyEntry);
Key<BillingEvent.OneTime> oneTimeBillKey = Key<BillingEvent.OneTime> oneTimeBillKey =
Key.create(historyEntryKey, BillingEvent.OneTime.class, 1); Key.create(historyEntryKey, BillingEvent.OneTime.class, 1);
Key<BillingEvent.Recurring> recurringBillKey = VKey<BillingEvent.Recurring> recurringBillKey =
Key.create(historyEntryKey, BillingEvent.Recurring.class, 2); VKey.from(Key.create(historyEntryKey, BillingEvent.Recurring.class, 2));
Key<PollMessage.Autorenew> autorenewPollKey = VKey<PollMessage.Autorenew> autorenewPollKey =
Key.create(historyEntryKey, PollMessage.Autorenew.class, 3); VKey.from(Key.create(historyEntryKey, PollMessage.Autorenew.class, 3));
Key<PollMessage.OneTime> onetimePollKey = VKey<PollMessage.OneTime> onetimePollKey =
Key.create(historyEntryKey, PollMessage.OneTime.class, 1); VKey.from(Key.create(historyEntryKey, PollMessage.OneTime.class, 1));
domain = domain =
persistResource( persistResource(
new DomainBase.Builder() new DomainBase.Builder()
@ -200,12 +200,10 @@ class InitSqlPipelineTest {
.setPendingTransferExpirationTime(fakeClock.nowUtc()) .setPendingTransferExpirationTime(fakeClock.nowUtc())
.setServerApproveEntities( .setServerApproveEntities(
ImmutableSet.of( ImmutableSet.of(
VKey.from(oneTimeBillKey), VKey.from(oneTimeBillKey), recurringBillKey, autorenewPollKey))
VKey.from(recurringBillKey),
VKey.from(autorenewPollKey)))
.setServerApproveBillingEvent(VKey.from(oneTimeBillKey)) .setServerApproveBillingEvent(VKey.from(oneTimeBillKey))
.setServerApproveAutorenewEvent(VKey.from(recurringBillKey)) .setServerApproveAutorenewEvent(recurringBillKey)
.setServerApproveAutorenewPollMessage(VKey.from(autorenewPollKey)) .setServerApproveAutorenewPollMessage(autorenewPollKey)
.setTransferRequestTime(fakeClock.nowUtc().plusDays(1)) .setTransferRequestTime(fakeClock.nowUtc().plusDays(1))
.setTransferStatus(TransferStatus.SERVER_APPROVED) .setTransferStatus(TransferStatus.SERVER_APPROVED)
.setTransferRequestTrid(Trid.create("client-trid", "server-trid")) .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))

0
db/src/main/resources/sql/flyway/V40__add_columns_to_domain.sql → db/src/main/resources/sql/flyway/V41__add_columns_to_domain.sql
View file