Fix accessing superclass fields in checkExists() (#799 )

* Fix accessing superclass fields in checkExists() JpaTransactionManagerImpl doesn't respect @Id fields in mapped superclasses. Replace calls to getDeclaredId() and getDeclaredField() with superclass friendly counterparts.
Add and use temp_history_id_sequence to avoid release error (#795 )
2026-06-09 16:33:02 +00:00 · 2020-09-11 13:45:51 -04:00 · 2020-09-11 12:25:08 -04:00 · 2020-09-10 17:36:22 -04:00 · 2020-09-10 12:02:24 -04:00 · 2020-09-09 19:37:41 -04:00
35 changed files with 531 additions and 111 deletions
@@ -55,9 +55,7 @@ FROM (
    FROM
      `%PROJECT_ID%.%DATASTORE_EXPORT_DATA_SET%.%REGISTRY_TABLE%`
    WHERE
-    -- TODO(b/18092292): Add a filter for tldState (not PDT/PREDELEGATION)
-      tldType = 'REAL'
-    AND disableInvoicing is not TRUE) ) AS BillingEvent
+      enableInvoicing IS TRUE) ) AS BillingEvent
  -- Gather billing ID from registrar table
  -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out
  -- non-billable registrars
@@ -46,6 +46,7 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithLongVKey;
+import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -274,7 +275,7 @@ public abstract class BillingEvent extends ImmutableObject
        @javax.persistence.Index(columnList = "allocation_token_id")
      })
  @AttributeOverride(name = "id", column = @Column(name = "billing_event_id"))
-  public static class OneTime extends BillingEvent {
+  public static class OneTime extends BillingEvent implements DatastoreAndSqlEntity {

    /** The billable value. */
    @AttributeOverrides({
@@ -450,7 +451,7 @@ public abstract class BillingEvent extends ImmutableObject
        @javax.persistence.Index(columnList = "recurrence_time_of_year")
      })
  @AttributeOverride(name = "id", column = @Column(name = "billing_recurrence_id"))
-  public static class Recurring extends BillingEvent {
+  public static class Recurring extends BillingEvent implements DatastoreAndSqlEntity {

    /**
     * The billing event recurs every year between {@link #eventTime} and this time on the
@@ -544,7 +545,7 @@ public abstract class BillingEvent extends ImmutableObject
        @javax.persistence.Index(columnList = "billingTime")
      })
  @AttributeOverride(name = "id", column = @Column(name = "billing_cancellation_id"))
-  public static class Cancellation extends BillingEvent {
+  public static class Cancellation extends BillingEvent implements DatastoreAndSqlEntity {

    /** The billing time of the charge that is being cancelled. */
    @Index
@@ -664,7 +665,7 @@ public abstract class BillingEvent extends ImmutableObject
  /** An event representing a modification of an existing one-time billing event. */
  @ReportedOn
  @Entity
-  public static class Modification extends BillingEvent {
+  public static class Modification extends BillingEvent implements DatastoreAndSqlEntity {

    /** The change in cost that should be applied to the original billing event. */
    Money cost;
@@ -45,6 +45,7 @@ import javax.persistence.Id;
@EntitySubclass
@Access(AccessType.FIELD)
 public class ContactHistory extends HistoryEntry {
+
  // Store ContactBase instead of ContactResource so we don't pick up its @Id
  ContactBase contactBase;

@@ -52,7 +53,7 @@ public class ContactHistory extends HistoryEntry {
  VKey<ContactResource> contactRepoId;

  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TempHistorySequenceGenerator")
  @Column(name = "historyRevisionId")
  @Access(AccessType.PROPERTY)
  @Override
@@ -60,6 +60,7 @@ import javax.persistence.Table;
@Access(AccessType.FIELD)
@IdClass(DomainHistoryId.class)
 public class DomainHistory extends HistoryEntry {
+
  // Store DomainContent instead of DomainBase so we don't pick up its @Id
  DomainContent domainContent;

@@ -75,7 +76,7 @@ public class DomainHistory extends HistoryEntry {
  Set<VKey<HostResource>> nsHosts;

  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TempHistorySequenceGenerator")
  @Column(name = "historyRevisionId")
  @Access(AccessType.PROPERTY)
  @Override
@@ -54,7 +54,7 @@ public class HostHistory extends HistoryEntry {
  VKey<HostResource> hostRepoId;

  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TempHistorySequenceGenerator")
  @Column(name = "historyRevisionId")
  @Access(AccessType.PROPERTY)
  @Override
@@ -17,6 +17,7 @@ package google.registry.model.index;
 import static google.registry.util.TypeUtils.instantiate;

 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
@@ -25,11 +26,13 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.EppResource;
 import google.registry.model.annotations.ReportedOn;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;

 /** An index that allows for quick enumeration of all EppResource entities (e.g. via map reduce). */
@ReportedOn
@Entity
-public class EppResourceIndex extends BackupGroupRoot {
+public class EppResourceIndex extends BackupGroupRoot implements DatastoreEntity {

  @Id
  String id;
@@ -74,4 +77,9 @@ public class EppResourceIndex extends BackupGroupRoot {
  public static <T extends EppResource> EppResourceIndex create(Key<T> resourceKey) {
    return create(EppResourceIndexBucket.getBucketKey(resourceKey), resourceKey);
  }
+
+  @Override
+  public ImmutableList<SqlEntity> toSqlEntities() {
+    return ImmutableList.of(); // not relevant in SQL
+  }
 }
@@ -24,16 +24,23 @@ import com.googlecode.objectify.annotation.Id;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.VirtualEntity;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;

 /** A virtual entity to represent buckets to which EppResourceIndex objects are randomly added. */
@Entity
@VirtualEntity
-public class EppResourceIndexBucket extends ImmutableObject {
+public class EppResourceIndexBucket extends ImmutableObject implements DatastoreEntity {

  @SuppressWarnings("unused")
  @Id
  private long bucketId;

+  @Override
+  public ImmutableList<SqlEntity> toSqlEntities() {
+    return ImmutableList.of(); // not relevant in SQL
+  }
+
  /**
   * Deterministic function that returns a bucket id based on the resource's roid.
   * NB: At the moment, nothing depends on this being deterministic, so we have the ability to
@@ -43,6 +43,8 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;
 import google.registry.util.NonFinalForTesting;
 import java.util.Map;
 import java.util.Optional;
@@ -61,28 +63,44 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
  /** The {@link ForeignKeyIndex} type for {@link ContactResource} entities. */
  @ReportedOn
  @Entity
-  public static class ForeignKeyContactIndex extends ForeignKeyIndex<ContactResource> {}
+  public static class ForeignKeyContactIndex extends ForeignKeyIndex<ContactResource>
+      implements DatastoreEntity {
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not relevant in SQL
+    }
+  }

  /** The {@link ForeignKeyIndex} type for {@link DomainBase} entities. */
  @ReportedOn
  @Entity
-  public static class ForeignKeyDomainIndex extends ForeignKeyIndex<DomainBase> {}
+  public static class ForeignKeyDomainIndex extends ForeignKeyIndex<DomainBase>
+      implements DatastoreEntity {
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not relevant in SQL
+    }
+  }

  /** The {@link ForeignKeyIndex} type for {@link HostResource} entities. */
  @ReportedOn
  @Entity
-  public static class ForeignKeyHostIndex extends ForeignKeyIndex<HostResource> {}
+  public static class ForeignKeyHostIndex extends ForeignKeyIndex<HostResource>
+      implements DatastoreEntity {
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not relevant in SQL
+    }
+  }

-  static final ImmutableMap<
-          Class<? extends EppResource>, Class<? extends ForeignKeyIndex<?>>>
+  static final ImmutableMap<Class<? extends EppResource>, Class<? extends ForeignKeyIndex<?>>>
      RESOURCE_CLASS_TO_FKI_CLASS =
          ImmutableMap.of(
              ContactResource.class, ForeignKeyContactIndex.class,
              DomainBase.class, ForeignKeyDomainIndex.class,
              HostResource.class, ForeignKeyHostIndex.class);

-  @Id
-  String foreignKey;
+  @Id String foreignKey;

  /**
   * The deletion time of this {@link ForeignKeyIndex}.
@@ -90,8 +108,7 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
   * <p>This will generally be equal to the deletion time of {@link #topReference}. However, in the
   * case of a {@link HostResource} that was renamed, this field will hold the time of the rename.
   */
-  @Index
-  DateTime deletionTime;
+  @Index DateTime deletionTime;

  /**
   * The referenced resource.
@@ -45,6 +45,7 @@ import google.registry.model.transfer.TransferResponse.ContactTransferResponse;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithLongVKey;
+import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.List;
 import java.util.Optional;
 import javax.persistence.AttributeOverride;
@@ -92,7 +93,7 @@ import org.joda.time.DateTime;
      @javax.persistence.Index(columnList = "eventTime")
    })
 public abstract class PollMessage extends ImmutableObject
-    implements Buildable, TransferServerApproveEntity {
+    implements Buildable, DatastoreAndSqlEntity, TransferServerApproveEntity {

  /** Entity id. */
  @Id
@@ -340,12 +340,12 @@ public class Registry extends ImmutableObject implements Buildable {
  TldType tldType = TldType.REAL;

  /**
-   * Whether to disable invoicing for a {@link TldType#REAL} TLD.
+   * Whether to enable invoicing for this TLD.
   *
-   * <p>Note that invoicing is always disabled for {@link TldType#TEST} TLDs. Setting this field has
-   * no effect for {@link TldType#TEST} TLDs.
+   * <p>Note that this boolean is the sole determiner on whether invoices should be generated for a
+   * TLD. This applies to {@link TldType#TEST} TLDs as well.
   */
-  boolean disableInvoicing = false;
+  boolean invoicingEnabled = false;

  /**
   * A property that transitions to different TldStates at different times. Stored as a list of
@@ -646,8 +646,8 @@ public class Registry extends ImmutableObject implements Buildable {
      return this;
    }

-    public Builder setDisableInvoicing(boolean disableInvoicing) {
-      getInstance().disableInvoicing = disableInvoicing;
+    public Builder setInvoicingEnabled(boolean invoicingEnabled) {
+      getInstance().invoicingEnabled = invoicingEnabled;
      return this;
    }

@@ -114,7 +114,7 @@ public final class PremiumList extends BaseDomainLabelList<Money, PremiumList.Pr
  /** Virtual parent entity for premium list entry entities associated with a single revision. */
  @ReportedOn
  @Entity
-  public static class PremiumListRevision extends ImmutableObject {
+  public static class PremiumListRevision extends ImmutableObject implements DatastoreEntity {

    @Parent Key<PremiumList> parent;

@@ -171,6 +171,11 @@ public final class PremiumList extends BaseDomainLabelList<Money, PremiumList.Pr
      }
      return revision;
    }
+
+    @Override
+    public ImmutableList<SqlEntity> toSqlEntities() {
+      return ImmutableList.of(); // not persisted in SQL
+    }
  }

  /**
@@ -18,6 +18,7 @@ import static com.googlecode.objectify.Key.getKind;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;

 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
@@ -40,6 +41,8 @@ import google.registry.model.host.HostHistory;
 import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;
 import java.util.Set;
 import javax.annotation.Nullable;
 import javax.persistence.Access;
@@ -59,7 +62,7 @@ import org.joda.time.DateTime;
@MappedSuperclass
@WithStringVKey // TODO(b/162229294): This should be resolved during the course of that bug
@Access(AccessType.FIELD)
-public class HistoryEntry extends ImmutableObject implements Buildable {
+public class HistoryEntry extends ImmutableObject implements Buildable, DatastoreEntity, SqlEntity {

  /** Represents the type of history entry. */
  public enum Type {
@@ -307,6 +310,18 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
    return resultEntity;
  }

+  // In SQL, save the child type
+  @Override
+  public ImmutableList<SqlEntity> toSqlEntities() {
+    return ImmutableList.of(toChildHistoryEntity());
+  }
+
+  // In Datastore, save as a HistoryEntry object regardless of this object's type
+  @Override
+  public ImmutableList<DatastoreEntity> toDatastoreEntities() {
+    return ImmutableList.of(asHistoryEntry());
+  }
+
  /** A builder for {@link HistoryEntry} since it is immutable */
  public static class Builder<T extends HistoryEntry, B extends Builder<?, ?>>
      extends GenericBuilder<T, B> {
@@ -0,0 +1,37 @@
+// Copyright 2020 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.
+
+package google.registry.persistence.converter;
+
+import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
+
+import com.googlecode.objectify.Key;
+import google.registry.model.registry.label.PremiumList;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/** JPA converter for a {@link Key} containing a {@link PremiumList} */
+@Converter(autoApply = true)
+public class PremiumListKeyConverter implements AttributeConverter<Key<PremiumList>, String> {
+
+  @Override
+  public String convertToDatabaseColumn(Key<PremiumList> attribute) {
+    return (attribute == null) ? null : attribute.getName();
+  }
+
+  @Override
+  public Key<PremiumList> convertToEntityAttribute(String dbData) {
+    return (dbData == null) ? null : Key.create(getCrossTldKey(), PremiumList.class, dbData);
+  }
+}
@@ -0,0 +1,37 @@
+// Copyright 2020 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.
+
+package google.registry.persistence.converter;
+
+import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
+
+import com.googlecode.objectify.Key;
+import google.registry.model.registry.label.ReservedList;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/** JPA converter for a {@link Key} containing a {@link ReservedList} */
+@Converter(autoApply = true)
+public class ReservedListKeyConverter implements AttributeConverter<Key<ReservedList>, String> {
+
+  @Override
+  public String convertToDatabaseColumn(Key<ReservedList> attribute) {
+    return (attribute == null) ? null : attribute.getName();
+  }
+
+  @Override
+  public Key<ReservedList> convertToEntityAttribute(String dbData) {
+    return (dbData == null) ? null : Key.create(getCrossTldKey(), ReservedList.class, dbData);
+  }
+}
@@ -391,7 +391,7 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
  private static ImmutableSet<EntityId> getEntityIdsFromEntity(
      EntityType<?> entityType, Object entity) {
    if (entityType.hasSingleIdAttribute()) {
-      String idName = entityType.getDeclaredId(entityType.getIdType().getJavaType()).getName();
+      String idName = entityType.getId(entityType.getIdType().getJavaType()).getName();
      Object idValue = getFieldValue(entity, idName);
      return ImmutableSet.of(new EntityId(idName, idValue));
    } else {
@@ -402,7 +402,7 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
  private static ImmutableSet<EntityId> getEntityIdsFromSqlKey(
      EntityType<?> entityType, Object sqlKey) {
    if (entityType.hasSingleIdAttribute()) {
-      String idName = entityType.getDeclaredId(entityType.getIdType().getJavaType()).getName();
+      String idName = entityType.getId(entityType.getIdType().getJavaType()).getName();
      return ImmutableSet.of(new EntityId(idName, sqlKey));
    } else {
      return getEntityIdsFromIdContainer(entityType, sqlKey);
@@ -429,7 +429,7 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {

  private static Object getFieldValue(Object object, String fieldName) {
    try {
-      Field field = object.getClass().getDeclaredField(fieldName);
+      Field field = getField(object.getClass(), fieldName);
      field.setAccessible(true);
      return field.get(object);
    } catch (NoSuchFieldException | IllegalAccessException e) {
@@ -437,6 +437,21 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
    }
  }

+  /** Gets the field definition from clazz or any superclass. */
+  private static Field getField(Class clazz, String fieldName) throws NoSuchFieldException {
+    try {
+      // Note that we have to use getDeclaredField() for this, getField() just finds public fields.
+      return clazz.getDeclaredField(fieldName);
+    } catch (NoSuchFieldException e) {
+      Class base = clazz.getSuperclass();
+      if (base != null) {
+        return getField(base, fieldName);
+      } else {
+        throw e;
+      }
+    }
+  }
+
  private static class TransactionInfo {
    EntityManager entityManager;
    boolean inTransaction = false;
@@ -14,6 +14,9 @@

 package google.registry.persistence.transaction;

+import com.google.common.collect.ImmutableList;
+import google.registry.schema.replay.DatastoreEntity;
+import google.registry.schema.replay.SqlEntity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -27,7 +30,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "Transaction")
-public class TransactionEntity {
+public class TransactionEntity implements SqlEntity {

  @Id
  @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -40,4 +43,9 @@ public class TransactionEntity {
  TransactionEntity(byte[] contents) {
    this.contents = contents;
  }
+
+  @Override
+  public ImmutableList<DatastoreEntity> toDatastoreEntities() {
+    return ImmutableList.of(); // not stored in Datastore per se
+  }
 }
@@ -118,10 +118,10 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {

  @Nullable
  @Parameter(
-      names = "--disable_invoicing",
-      description = "Whether invoicing is disabled for a REAL tld.",
+      names = "--invoicing_enabled",
+      description = "Whether invoicing is enabled for this tld.",
      arity = 1)
-  private Boolean disableInvoicing;
+  private Boolean invoicingEnabled;

  @Nullable
  @Parameter(
@@ -327,7 +327,7 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
      Optional.ofNullable(serverStatusChangeCost)
          .ifPresent(builder::setServerStatusChangeBillingCost);
      Optional.ofNullable(tldType).ifPresent(builder::setTldType);
-      Optional.ofNullable(disableInvoicing).ifPresent(builder::setDisableInvoicing);
+      Optional.ofNullable(invoicingEnabled).ifPresent(builder::setInvoicingEnabled);
      Optional.ofNullable(lordnUsername).ifPresent(u -> builder.setLordnUsername(u.orElse(null)));
      Optional.ofNullable(claimsPeriodEnd).ifPresent(builder::setClaimsPeriodEnd);
      Optional.ofNullable(numDnsPublishShards).ifPresent(builder::setNumDnsPublishLocks);
@@ -11,7 +11,10 @@
    </attributes>
  </embeddable>

-  <sequence-generator name="HistorySequenceGenerator" sequence-name="history_id_sequence" />
+  <sequence-generator name="HistorySequenceGenerator" sequence-name="history_id_sequence"/>
+
+  <!-- TODO(shicong): Drop this sequence and change all history tables to use the above one. -->
+  <sequence-generator name="TempHistorySequenceGenerator" sequence-name="temp_history_id_sequence"/>

  <persistence-unit-metadata>
    <persistence-unit-defaults>
@@ -79,7 +79,9 @@
    <class>google.registry.persistence.converter.InetAddressSetConverter</class>
    <class>google.registry.persistence.converter.LocalDateConverter</class>
    <class>google.registry.persistence.converter.PostalInfoChoiceListConverter</class>
+    <class>google.registry.persistence.converter.PremiumListKeyConverter</class>
    <class>google.registry.persistence.converter.RegistrarPocSetConverter</class>
+    <class>google.registry.persistence.converter.ReservedListKeyConverter</class>
    <class>google.registry.persistence.converter.Spec11ThreatMatchThreatTypeSetConverter</class>
    <class>google.registry.persistence.converter.StatusValueSetConverter</class>
    <class>google.registry.persistence.converter.StringListConverter</class>
@@ -21,6 +21,7 @@ import static org.joda.time.DateTimeZone.UTC;

 import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.common.CrossTldSingleton;
+import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
@@ -38,6 +39,7 @@ public class CreateAutoTimestampTest {

  /** Timestamped class. */
  @Entity(name = "CatTestEntity")
+  @EntityForTesting
  public static class TestObject extends CrossTldSingleton {
    CreateAutoTimestamp createTime = CreateAutoTimestamp.create(null);
  }
@@ -29,6 +29,7 @@ import com.google.common.collect.Iterables;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
+import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.util.CidrAddressBlock;
 import java.util.ArrayDeque;
@@ -279,6 +280,7 @@ public class ImmutableObjectTest {

  /** Simple subclass of ImmutableObject. */
  @Entity
+  @EntityForTesting
  public static class ValueObject extends ImmutableObject {
    @Id
    long id;
@@ -21,6 +21,7 @@ import static org.joda.time.DateTimeZone.UTC;

 import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.common.CrossTldSingleton;
+import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
@@ -38,6 +39,7 @@ public class UpdateAutoTimestampTest {

  /** Timestamped class. */
  @Entity(name = "UatTestEntity")
+  @EntityForTesting
  public static class UpdateAutoTimestampTestObject extends CrossTldSingleton {
    UpdateAutoTimestamp updateTime = UpdateAutoTimestamp.create(null);
  }
@@ -45,6 +45,7 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.reporting.HistoryEntry;
+import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreHelper;
 import google.registry.testing.FakeClock;
@@ -69,13 +70,14 @@ public class OfyTest {
  @BeforeEach
  void beforeEach() {
    createTld("tld");
-    someObject = new HistoryEntry.Builder()
-        .setClientId("client id")
-        .setModificationTime(START_OF_TIME)
-        .setParent(persistActiveContact("parentContact"))
-        .setTrid(Trid.create("client", "server"))
-        .setXmlBytes("<xml></xml>".getBytes(UTF_8))
-        .build();
+    someObject =
+        new HistoryEntry.Builder()
+            .setClientId("client id")
+            .setModificationTime(START_OF_TIME)
+            .setParent(persistActiveContact("parentContact"))
+            .setTrid(Trid.create("client", "server"))
+            .setXmlBytes("<xml></xml>".getBytes(UTF_8))
+            .build();
    // This can't be initialized earlier because namespaces need the AppEngineRule to work.
  }

@@ -111,8 +113,7 @@ public class OfyTest {
        assertThrows(
            IllegalArgumentException.class,
            () ->
-                tm()
-                    .transact(
+                tm().transact(
                        () -> {
                          ofy().save().entity(someObject);
                          ofy().save().entity(someObject);
@@ -126,8 +127,7 @@ public class OfyTest {
        assertThrows(
            IllegalArgumentException.class,
            () ->
-                tm()
-                    .transact(
+                tm().transact(
                        () -> {
                          ofy().delete().entity(someObject);
                          ofy().delete().entity(someObject);
@@ -141,8 +141,7 @@ public class OfyTest {
        assertThrows(
            IllegalArgumentException.class,
            () ->
-                tm()
-                    .transact(
+                tm().transact(
                        () -> {
                          ofy().save().entity(someObject);
                          ofy().delete().entity(someObject);
@@ -156,8 +155,7 @@ public class OfyTest {
        assertThrows(
            IllegalArgumentException.class,
            () ->
-                tm()
-                    .transact(
+                tm().transact(
                        () -> {
                          ofy().delete().entity(someObject);
                          ofy().save().entity(someObject);
@@ -174,13 +172,12 @@ public class OfyTest {

  /** Simple entity class with lifecycle callbacks. */
  @com.googlecode.objectify.annotation.Entity
+  @EntityForTesting
  public static class LifecycleObject extends ImmutableObject {

-    @Parent
-    Key<?> parent = getCrossTldKey();
+    @Parent Key<?> parent = getCrossTldKey();

-    @Id
-    long id = 1;
+    @Id long id = 1;

    boolean onLoadCalled;
    boolean onSaveCalled;
@@ -218,20 +215,22 @@ public class OfyTest {
  /** Avoid regressions of b/21309102 where transaction time did not change on each retry. */
  @Test
  void testTransact_getsNewTimestampOnEachTry() {
-    tm().transact(new Runnable() {
+    tm().transact(
+            new Runnable() {

-      DateTime firstAttemptTime;
+              DateTime firstAttemptTime;

-      @Override
-      public void run() {
-        if (firstAttemptTime == null) {
-          // Sleep a bit to ensure that the next attempt is at a new millisecond.
-          firstAttemptTime = tm().getTransactionTime();
-          sleepUninterruptibly(10, MILLISECONDS);
-          throw new ConcurrentModificationException();
-        }
-        assertThat(tm().getTransactionTime()).isGreaterThan(firstAttemptTime);
-      }});
+              @Override
+              public void run() {
+                if (firstAttemptTime == null) {
+                  // Sleep a bit to ensure that the next attempt is at a new millisecond.
+                  firstAttemptTime = tm().getTransactionTime();
+                  sleepUninterruptibly(10, MILLISECONDS);
+                  throw new ConcurrentModificationException();
+                }
+                assertThat(tm().getTransactionTime()).isGreaterThan(firstAttemptTime);
+              }
+            });
  }

  @Test
@@ -319,17 +318,19 @@ public class OfyTest {
          }
        };
    // A commit logged work that throws on the first attempt to get its result.
-    CommitLoggedWork<Void> commitLoggedWork = new CommitLoggedWork<Void>(work, new SystemClock()) {
-      boolean firstCallToGetResult = true;
+    CommitLoggedWork<Void> commitLoggedWork =
+        new CommitLoggedWork<Void>(work, new SystemClock()) {
+          boolean firstCallToGetResult = true;

-      @Override
-      public Void getResult() {
-        if (firstCallToGetResult) {
-          firstCallToGetResult = false;
-          throw new DatastoreTimeoutException("");
-        }
-        return null;
-      }};
+          @Override
+          public Void getResult() {
+            if (firstCallToGetResult) {
+              firstCallToGetResult = false;
+              throw new DatastoreTimeoutException("");
+            }
+            return null;
+          }
+        };
    // Despite the DatastoreTimeoutException in the first call to getResult(), this should succeed
    // without retrying. If a retry is triggered, the test should fail due to the call to fail().
    ofy().transactCommitLoggedWork(commitLoggedWork);
@@ -381,8 +382,7 @@ public class OfyTest {
  void test_getBaseEntityClassFromEntityOrKey_subclassEntity() {
    DomainBase domain = DatastoreHelper.newDomainBase("test.tld");
    assertThat(getBaseEntityClassFromEntityOrKey(domain)).isEqualTo(DomainBase.class);
-    assertThat(getBaseEntityClassFromEntityOrKey(Key.create(domain)))
-        .isEqualTo(DomainBase.class);
+    assertThat(getBaseEntityClassFromEntityOrKey(Key.create(domain))).isEqualTo(DomainBase.class);
  }

  @Test
@@ -27,6 +27,7 @@ import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.common.CrossTldSingleton;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.Ofy;
+import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectExtension;
@@ -42,6 +43,7 @@ public class CommitLogRevisionsTranslatorFactoryTest {
  private static final DateTime START_TIME = DateTime.parse("2000-01-01TZ");

  @Entity(name = "ClrtfTestEntity")
+  @EntityForTesting
  public static class TestObject extends CrossTldSingleton {
    ImmutableSortedMap<DateTime, Key<CommitLogManifest>> revisions = ImmutableSortedMap.of();
  }
@@ -73,11 +75,11 @@ public class CommitLogRevisionsTranslatorFactoryTest {

  @Test
  void testSave_doesNotMutateOriginalResource() {
-     TestObject object = new TestObject();
-     save(object);
-     assertThat(object.revisions).isEmpty();
-     assertThat(reload().revisions).isNotEmpty();
-   }
+    TestObject object = new TestObject();
+    save(object);
+    assertThat(object.revisions).isEmpty();
+    assertThat(reload().revisions).isNotEmpty();
+  }

  @Test
  void testSave_translatorAddsKeyToCommitLogToField() {
@@ -149,8 +151,10 @@ public class CommitLogRevisionsTranslatorFactoryTest {
    com.google.appengine.api.datastore.Entity entity =
        tm().transactNewReadOnly(() -> ofy().save().toEntity(reload()));
    assertThat(entity.getProperties().keySet()).containsExactly("revisions.key", "revisions.value");
-    assertThat(entity.getProperties()).containsEntry(
-        "revisions.key", ImmutableList.of(START_TIME.toDate(), START_TIME.plusDays(1).toDate()));
+    assertThat(entity.getProperties())
+        .containsEntry(
+            "revisions.key",
+            ImmutableList.of(START_TIME.toDate(), START_TIME.plusDays(1).toDate()));
    assertThat(entity.getProperty("revisions.value")).isInstanceOf(List.class);
    assertThat(((List<Object>) entity.getProperty("revisions.value")).get(0))
        .isInstanceOf(com.google.appengine.api.datastore.Key.class);
@@ -0,0 +1,90 @@
+// Copyright 2020 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.
+
+package google.registry.persistence.converter;
+
+import static com.google.common.truth.Truth.assertThat;
+import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+
+import com.googlecode.objectify.Key;
+import google.registry.model.ImmutableObject;
+import google.registry.model.registry.label.PremiumList;
+import google.registry.testing.AppEngineExtension;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Unit tests for {@link PremiumListKeyConverter}. */
+class PremiumListKeyConverterTest {
+
+  @RegisterExtension
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder()
+          .withDatastoreAndCloudSql()
+          .withJpaUnitTestEntities(PremiumListEntity.class)
+          .build();
+
+  private final PremiumListKeyConverter converter = new PremiumListKeyConverter();
+
+  @Test
+  void convertToDatabaseColumn_returnsNullIfInputIsNull() {
+    assertThat(converter.convertToDatabaseColumn(null)).isNull();
+  }
+
+  @Test
+  void convertToDatabaseColumn_convertsCorrectly() {
+    assertThat(
+            converter.convertToDatabaseColumn(
+                Key.create(getCrossTldKey(), PremiumList.class, "testList")))
+        .isEqualTo("testList");
+  }
+
+  @Test
+  void convertToEntityAttribute_returnsNullIfInputIsNull() {
+    assertThat(converter.convertToEntityAttribute(null)).isNull();
+  }
+
+  @Test
+  void convertToEntityAttribute_convertsCorrectly() {
+    assertThat(converter.convertToEntityAttribute("testList"))
+        .isEqualTo(Key.create(getCrossTldKey(), PremiumList.class, "testList"));
+  }
+
+  @Test
+  void testRoundTrip() {
+    Key<PremiumList> key = Key.create(getCrossTldKey(), PremiumList.class, "test");
+    PremiumListEntity testEntity = new PremiumListEntity(key);
+    jpaTm().transact(() -> jpaTm().getEntityManager().persist(testEntity));
+    PremiumListEntity persisted =
+        jpaTm().transact(() -> jpaTm().getEntityManager().find(PremiumListEntity.class, "test"));
+    assertThat(persisted.premiumList).isEqualTo(key);
+  }
+
+  @Entity(name = "PremiumListEntity")
+  private static class PremiumListEntity extends ImmutableObject {
+
+    @Id String name;
+
+    Key<PremiumList> premiumList;
+
+    public PremiumListEntity() {}
+
+    PremiumListEntity(Key<PremiumList> premiumList) {
+      this.name = premiumList.getName();
+      this.premiumList = premiumList;
+    }
+  }
+}
@@ -0,0 +1,90 @@
+// Copyright 2020 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.
+
+package google.registry.persistence.converter;
+
+import static com.google.common.truth.Truth.assertThat;
+import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
+
+import com.googlecode.objectify.Key;
+import google.registry.model.ImmutableObject;
+import google.registry.model.registry.label.ReservedList;
+import google.registry.testing.AppEngineExtension;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Unit tests for {@link ReservedListKeyConverter}. */
+class ReservedListKeyConverterTest {
+
+  @RegisterExtension
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder()
+          .withDatastoreAndCloudSql()
+          .withJpaUnitTestEntities(ReservedListEntity.class)
+          .build();
+
+  private final ReservedListKeyConverter converter = new ReservedListKeyConverter();
+
+  @Test
+  void convertToDatabaseColumn_returnsNullIfInputIsNull() {
+    assertThat(converter.convertToDatabaseColumn(null)).isNull();
+  }
+
+  @Test
+  void convertToDatabaseColumn_convertsCorrectly() {
+    assertThat(
+            converter.convertToDatabaseColumn(
+                Key.create(getCrossTldKey(), ReservedList.class, "testList")))
+        .isEqualTo("testList");
+  }
+
+  @Test
+  void convertToEntityAttribute_returnsNullIfInputIsNull() {
+    assertThat(converter.convertToEntityAttribute(null)).isNull();
+  }
+
+  @Test
+  void convertToEntityAttribute_convertsCorrectly() {
+    assertThat(converter.convertToEntityAttribute("testList"))
+        .isEqualTo(Key.create(getCrossTldKey(), ReservedList.class, "testList"));
+  }
+
+  @Test
+  void testRoundTrip() {
+    Key<ReservedList> key = Key.create(getCrossTldKey(), ReservedList.class, "test");
+    ReservedListEntity testEntity = new ReservedListEntity(key);
+    jpaTm().transact(() -> jpaTm().getEntityManager().persist(testEntity));
+    ReservedListEntity persisted =
+        jpaTm().transact(() -> jpaTm().getEntityManager().find(ReservedListEntity.class, "test"));
+    assertThat(persisted.reservedList).isEqualTo(key);
+  }
+
+  @Entity(name = "ReservedListEntity")
+  private static class ReservedListEntity extends ImmutableObject {
+
+    @Id String name;
+
+    Key<ReservedList> reservedList;
+
+    public ReservedListEntity() {}
+
+    ReservedListEntity(Key<ReservedList> reservedList) {
+      this.name = reservedList.getName();
+      this.reservedList = reservedList;
+    }
+  }
+}
@@ -37,6 +37,8 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.stream.Stream;
+import javax.persistence.Embeddable;
+import javax.persistence.MappedSuperclass;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -65,7 +67,7 @@ public class TransactionManagerTest {
          .withClock(fakeClock)
          .withDatastoreAndCloudSql()
          .withOfyTestEntities(TestEntity.class)
-          .withJpaUnitTestEntities(TestEntity.class)
+          .withJpaUnitTestEntities(TestEntity.class, TestEntityBase.class)
          .build();

  TransactionManagerTest() {}
@@ -324,17 +326,31 @@ public class TransactionManagerTest {
    entities.forEach(TransactionManagerTest::assertEntityNotExist);
  }

+  /**
+   * We put the id field into a base class to test that id fields can be discovered in a base class.
+   */
+  @MappedSuperclass
+  @Embeddable
+  private static class TestEntityBase extends ImmutableObject {
+    @Id @javax.persistence.Id protected String name;
+
+    TestEntityBase(String name) {
+      this.name = name;
+    }
+
+    TestEntityBase() {}
+  }
+
  @Entity(name = "TxnMgrTestEntity")
  @javax.persistence.Entity(name = "TestEntity")
-  private static class TestEntity extends ImmutableObject {
-    @Id @javax.persistence.Id private String name;
+  private static class TestEntity extends TestEntityBase {

    private String data;

    private TestEntity() {}

    private TestEntity(String name, String data) {
-      this.name = name;
+      super(name);
      this.data = data;
    }

@@ -41,24 +41,32 @@ public class EntityTest {
        new ClassGraph().enableAnnotationInfo().whitelistPackages("google.registry").scan()) {
      // All javax.persistence entities must implement SqlEntity and vice versa
      ImmutableSet<String> javaxPersistenceClasses =
-          getClassNames(
-              scanResult.getClassesWithAnnotation(javax.persistence.Entity.class.getName()));
+          getAllClassesWithAnnotation(scanResult, javax.persistence.Entity.class.getName());
      ImmutableSet<String> sqlEntityClasses =
          getClassNames(scanResult.getClassesImplementing(SqlEntity.class.getName()));
-      assertThat(javaxPersistenceClasses).isEqualTo(sqlEntityClasses);
+      assertThat(sqlEntityClasses).containsExactlyElementsIn(javaxPersistenceClasses);

-      // All com.googlecode.objectify.annotation.Entity classes must implement DatastoreEntity and
-      // vice versa
+      // All com.googlecode.objectify entities must implement DatastoreEntity and vice versa
      ImmutableSet<String> objectifyClasses =
-          getClassNames(
-              scanResult.getClassesWithAnnotation(
-                  com.googlecode.objectify.annotation.Entity.class.getName()));
+          getAllClassesWithAnnotation(
+              scanResult, com.googlecode.objectify.annotation.Entity.class.getName());
      ImmutableSet<String> datastoreEntityClasses =
          getClassNames(scanResult.getClassesImplementing(DatastoreEntity.class.getName()));
-      assertThat(objectifyClasses).isEqualTo(datastoreEntityClasses);
+      assertThat(datastoreEntityClasses).containsExactlyElementsIn(objectifyClasses);
    }
  }

+  private ImmutableSet<String> getAllClassesWithAnnotation(
+      ScanResult scanResult, String annotation) {
+    ImmutableSet.Builder<String> result = new ImmutableSet.Builder<>();
+    ClassInfoList classesWithAnnotation = scanResult.getClassesWithAnnotation(annotation);
+    result.addAll(getClassNames(classesWithAnnotation));
+    classesWithAnnotation.stream()
+        .map(ClassInfo::getSubclasses)
+        .forEach(classInfoList -> result.addAll(getClassNames(classInfoList)));
+    return result.build();
+  }
+
  private ImmutableSet<String> getClassNames(ClassInfoList classInfoList) {
    return classInfoList.stream()
        .filter(ClassInfo::isStandardClass)
@@ -23,11 +23,11 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.VirtualEntity;
 import google.registry.model.common.EntityGroupRoot;
+import google.registry.schema.replay.EntityTest.EntityForTesting;

-/**
- * A test model object that can be persisted in any entity group.
- */
+/** A test model object that can be persisted in any entity group. */
@Entity
+@EntityForTesting
 public class TestObject extends ImmutableObject {

  @Parent
@@ -65,6 +65,7 @@ public class TestObject extends ImmutableObject {
  /** A test @VirtualEntity model object, which should not be persisted. */
  @Entity
  @VirtualEntity
+  @EntityForTesting
  public static class TestVirtualObject extends ImmutableObject {

    @Id
@@ -55,9 +55,7 @@ FROM (
    FROM
      `my-project-id.latest_datastore_export.Registry`
    WHERE
-    -- TODO(b/18092292): Add a filter for tldState (not PDT/PREDELEGATION)
-      tldType = 'REAL'
-    AND disableInvoicing is not TRUE) ) AS BillingEvent
+      enableInvoicing IS TRUE) ) AS BillingEvent
  -- Gather billing ID from registrar table
  -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out
  -- non-billable registrars
@@ -618,9 +618,9 @@ enum google.registry.model.registrar.RegistrarContact$Type {
 class google.registry.model.registry.Registry {
  @Id java.lang.String tldStrId;
  @Parent com.googlecode.objectify.Key<google.registry.model.common.EntityGroupRoot> parent;
-  boolean disableInvoicing;
  boolean dnsPaused;
  boolean escrowEnabled;
+  boolean invoicingEnabled;
  com.googlecode.objectify.Key<google.registry.model.registry.label.PremiumList> premiumList;
  google.registry.model.CreateAutoTimestamp creationTime;
  google.registry.model.common.TimedTransitionProperty<google.registry.model.registry.Registry$TldState, google.registry.model.registry.Registry$TldStateTransition> tldStateTransitions;
@@ -0,0 +1,19 @@
+-- Copyright 2020 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 ONLY public."Domain"
+    DROP CONSTRAINT fk_domain_billing_recurrence_id;
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_billing_recurrence_id FOREIGN KEY (billing_recurrence_id)
+    REFERENCES public."BillingRecurrence"(billing_recurrence_id);
@@ -0,0 +1,20 @@
+-- Copyright 2020 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.
+
+create sequence "temp_history_id_sequence"
+    start with 1
+    increment by 50
+    no minvalue
+    no maxvalue
+    cache 1;
@@ -11,7 +11,7 @@
 -- 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.
-create sequence history_id_sequence start 1 increment 50;
+create sequence temp_history_id_sequence start 1 increment 50;

    create table "AllocationToken" (
       token text not null,
@@ -930,6 +930,18 @@ CREATE SEQUENCE public.history_id_sequence
    CACHE 1;


+--
+-- Name: temp_history_id_sequence; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.temp_history_id_sequence
+    START WITH 1
+    INCREMENT BY 50
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
 --
 -- Name: BillingCancellation billing_cancellation_id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1738,7 +1750,7 @@ ALTER TABLE ONLY public."Domain"
 --

 ALTER TABLE ONLY public."Domain"
-    ADD CONSTRAINT fk_domain_billing_recurrence_id FOREIGN KEY (billing_recurrence_id) REFERENCES public."BillingEvent"(billing_event_id);
+    ADD CONSTRAINT fk_domain_billing_recurrence_id FOREIGN KEY (billing_recurrence_id) REFERENCES public."BillingRecurrence"(billing_recurrence_id);


 --
Author	SHA1	Message	Date
Michael Muller	5488e1b323	Fix accessing superclass fields in checkExists() (#799 ) * Fix accessing superclass fields in checkExists() JpaTransactionManagerImpl doesn't respect @Id fields in mapped superclasses. Replace calls to getDeclaredId() and getDeclaredField() with superclass friendly counterparts.	2020-09-11 13:45:51 -04:00
Shicong Huang	5ab0f97351	Add and use temp_history_id_sequence to avoid release error (#795 )	2020-09-11 12:25:08 -04:00
sarahcaseybot	f7b65327da	Add type converter for Key<ReservedList> and Key<PremiumList> (#796 ) * Add converter for reservedlist and premiumlist keys * Remove public modifier from test classes	2020-09-10 17:36:22 -04:00
Michael Muller	36482ce94f	Fix the billing occurrence foreign key (#797 ) * Fix the billing occurrence foreign key Fix the Domain.billing_occurrence_id foreign key constraint to reference the correct table (BillingRecurrence, not BillingEvent).	2020-09-10 12:02:24 -04:00
Lai Jiang	125f509b46	Change disable invoicing flag to enable invoicing flag (#783 ) * Change disable invoicing flag to enable invoicing flag This flag will be the sole determinor on if invoicing is enabled, regardless of TLD types. Once this PR is deployed we will need to run the nomulus command to update this flag on all launched open TLDs. For context on why this change is made, see b/159626744. * Rename enableInvoicing to InvoicingEnabled	2020-09-09 19:37:41 -04:00
gbrodman	fb7ba80b86	Implement DatastoreEntity/SqlEntity for many more classes (#788 ) * Implement DatastoreEntity/SqlEntity for many more classes We still have many more classes to go, but this gets us closer to guaranteeing that we can convert from Datastore to SQL objects and back again. * Shift SqlEntity impl to HistoryEntry	2020-09-09 13:56:59 -04:00