1 files changed, 8 insertions, 10 deletions
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/server/ReviewDb.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/server/ReviewDb.java
index 149626b214..f1ab7527e3 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/server/ReviewDb.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/server/ReviewDb.java
@@ -43,11 +43,9 @@ public interface ReviewDb extends Schema {
   @Relation(id = 2)
   SystemConfigAccess systemConfig();
 
-  @Relation(id = 3)
-  ApprovalCategoryAccess approvalCategories();
+  // Deleted @Relation(id = 3)
 
-  @Relation(id = 4)
-  ApprovalCategoryValueAccess approvalCategoryValues();
+  // Deleted @Relation(id = 4)
 
   @Relation(id = 6)
   AccountAccess accounts();
@@ -70,12 +68,6 @@ public interface ReviewDb extends Schema {
   @Relation(id = 13)
   AccountGroupMemberAuditAccess accountGroupMembersAudit();
 
-  @Relation(id = 14)
-  AccountGroupIncludeAccess accountGroupIncludes();
-
-  @Relation(id = 15)
-  AccountGroupIncludeAuditAccess accountGroupIncludesAudit();
-
   @Relation(id = 17)
   AccountDiffPreferenceAccess accountDiffPreferences();
 
@@ -112,6 +104,12 @@ public interface ReviewDb extends Schema {
   @Relation(id = 28)
   SubmoduleSubscriptionAccess submoduleSubscriptions();
 
+  @Relation(id = 29)
+  AccountGroupIncludeByUuidAccess accountGroupIncludesByUuid();
+
+  @Relation(id = 30)
+  AccountGroupIncludeByUuidAuditAccess accountGroupIncludesByUuidAudit();
+
   /** Create the next unique id for an {@link Account}. */
   @Sequence(startWith = 1000000)
   int nextAccountId() throws OrmException;