From 2d82b4a84ec59a5b8bcfaf8081b1a8c2e6a546a4 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 19 Oct 2011 17:01:36 -0700 Subject: [PATCH] Minor ORM cleanups to support other backends Change-Id: I788da58dffd81dc9b7b0344b304491b4f38d459a --- .../com/google/gerrit/reviewdb/AccountAgreement.java | 4 ++++ .../gerrit/reviewdb/AccountGroupAgreement.java | 4 ++++ .../gerrit/reviewdb/AccountGroupIncludeAudit.java | 8 ++++++++ .../gerrit/reviewdb/AccountGroupMemberAudit.java | 8 ++++++++ .../gerrit/reviewdb/AccountGroupNameAccess.java | 2 +- .../google/gerrit/reviewdb/AccountProjectWatch.java | 8 ++++++++ .../gerrit/reviewdb/PatchLineCommentAccess.java | 12 ------------ .../com/google/gerrit/reviewdb/PatchSetAccess.java | 4 ---- .../com/google/gerrit/reviewdb/PatchSetApproval.java | 8 ++++++++ .../com/google/gerrit/reviewdb/StarredChange.java | 8 ++++++++ .../java/com/google/gerrit/reviewdb/TrackingId.java | 12 ++++++++++++ 11 files changed, 61 insertions(+), 17 deletions(-) diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java index 39ed66dcf1..57b9340a0a 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java @@ -45,6 +45,10 @@ public final class AccountAgreement implements AbstractAgreement { return accountId; } + public ContributorAgreement.Id getContributorAgreementId() { + return claId; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {claId}; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java index e7c4ad0645..fd5d58b419 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java @@ -47,6 +47,10 @@ public final class AccountGroupAgreement implements AbstractAgreement { return groupId; } + public ContributorAgreement.Id getContributorAgreementId() { + return claId; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {claId}; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupIncludeAudit.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupIncludeAudit.java index e99e48094d..326dfd3539 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupIncludeAudit.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupIncludeAudit.java @@ -49,6 +49,14 @@ public final class AccountGroupIncludeAudit { return groupId; } + public AccountGroup.Id getIncludedId() { + return includeId; + } + + public Timestamp getAddedOn() { + return addedOn; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {includeId}; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java index e2ce939e7f..7547efbd09 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java @@ -49,6 +49,14 @@ public final class AccountGroupMemberAudit { return accountId; } + public AccountGroup.Id getGroupId() { + return groupId; + } + + public Timestamp getAddedOn() { + return addedOn; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {groupId}; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupNameAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupNameAccess.java index 8a2fb6bb80..12db5ce2c8 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupNameAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupNameAccess.java @@ -27,7 +27,7 @@ public interface AccountGroupNameAccess extends AccountGroupName get(AccountGroup.NameKey name) throws OrmException; @Query("ORDER BY name") - ResultSet all(); + ResultSet all() throws OrmException; @Query("WHERE name.name >= ? AND name.name <= ? ORDER BY name LIMIT ?") ResultSet suggestByName(String nameA, String nameB, diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java index c18ae823cd..6c62e12b6e 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java @@ -56,6 +56,14 @@ public final class AccountProjectWatch { return accountId; } + public Project.NameKey getProjectName() { + return projectName; + } + + public Filter getFilter() { + return filter; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {projectName, filter}; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java index ddff0f19a6..fbf38cf712 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java @@ -28,11 +28,6 @@ public interface PatchLineCommentAccess extends @Query("WHERE key.patchKey.patchSetId.changeId = ?") ResultSet byChange(Change.Id id) throws OrmException; - @Query("WHERE key.patchKey = ? AND status = '" - + PatchLineComment.STATUS_PUBLISHED + "' ORDER BY lineNbr,writtenOn") - ResultSet publishedByPatch(Patch.Key patch) - throws OrmException; - @Query("WHERE key.patchKey.patchSetId.changeId = ?" + " AND key.patchKey.fileName = ? AND status = '" + PatchLineComment.STATUS_PUBLISHED + "' ORDER BY lineNbr,writtenOn") @@ -51,13 +46,6 @@ public interface PatchLineCommentAccess extends (PatchSet.Id patchset, Account.Id author) throws OrmException; - @Query("WHERE key.patchKey = ? AND status = '" - + PatchLineComment.STATUS_DRAFT - + "' AND author = ? ORDER BY lineNbr,writtenOn") - ResultSet draftByPatchAuthor - (Patch.Key patch, Account.Id author) - throws OrmException; - @Query("WHERE key.patchKey.patchSetId.changeId = ?" + " AND key.patchKey.fileName = ? AND author = ? AND status = '" + PatchLineComment.STATUS_DRAFT + "' ORDER BY lineNbr,writtenOn") diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java index fa594f7694..c9d4b4f6e8 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java @@ -27,10 +27,6 @@ public interface PatchSetAccess extends Access { @Query("WHERE id.changeId = ? ORDER BY id.patchSetId") ResultSet byChange(Change.Id id) throws OrmException; - @Query("WHERE id.changeId = ? AND revision = ?") - ResultSet byChangeRevision(Change.Id id, RevId rev) - throws OrmException; - @Query("WHERE revision = ? LIMIT 2") ResultSet byRevision(RevId rev) throws OrmException; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java index 341d085551..a3698f47c0 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java @@ -51,6 +51,14 @@ public final class PatchSetApproval { return patchSetId; } + public Account.Id getAccountId() { + return accountId; + } + + public ApprovalCategory.Id getCategoryId() { + return categoryId; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {accountId, categoryId}; diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java index 7e4359b480..426bd11e10 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java @@ -43,6 +43,10 @@ public class StarredChange { return accountId; } + public Change.Id getChangeId() { + return changeId; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {changeId}; @@ -59,6 +63,10 @@ public class StarredChange { key = k; } + public StarredChange.Key getKey() { + return key; + } + public Account.Id getAccountId() { return key.accountId; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/TrackingId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/TrackingId.java index d59e492732..1548807fd2 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/TrackingId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/TrackingId.java @@ -102,6 +102,14 @@ public final class TrackingId { return changeId; } + public TrackingId.Id getTrackingId() { + return trackingId; + } + + public TrackingId.System getTrackingSystem() { + return trackingSystem; + } + @Override public com.google.gwtorm.client.Key[] members() { return new com.google.gwtorm.client.Key[] {trackingId, trackingSystem}; @@ -123,6 +131,10 @@ public final class TrackingId { key = new Key(ch, new TrackingId.Id(id), new TrackingId.System(s)); } + public TrackingId.Key getKey() { + return key; + } + public Change.Id getChangeId() { return key.changeId; }