Skip to content

The Unified and Autonomous Development Platform

Change to use o_ for table and column prefix

Robin Shenfede99edd25b
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index 7cca590b11..cbf9fb54e5 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -488,7 +488,7 @@ public class CoreModule extends AbstractPluginModule {
// Use an optional binding here in case our client does not like to
// start persist service provided by this plugin
bind(Interceptor.class).to(HibernateInterceptor.class);
- bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("g_"));
+ bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("o_"));
bind(UnitOfWork.class).to(DefaultUnitOfWork.class);
bind(IdManager.class).to(DefaultIdManager.class);
diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.java
index f1bfebc59b..ba340c86b9 100644
--- a/core/src/main/java/io/onedev/server/model/Build.java
+++ b/core/src/main/java/io/onedev/server/model/Build.java
@@ -29,8 +29,8 @@ import io.onedev.server.util.facade.BuildFacade;
@Entity
@Table(
- indexes={@Index(columnList="g_configuration_id"), @Index(columnList="commitHash"), @Index(columnList="version")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_configuration_id", "commitHash"})}
+ indexes={@Index(columnList="o_configuration_id"), @Index(columnList="commitHash"), @Index(columnList="version")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_configuration_id", "commitHash"})}
)
public class Build extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java b/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
index 6cf529db2f..8896789e52 100644
--- a/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
@@ -19,8 +19,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
public class BuildQuerySetting extends QuerySetting<NamedBuildQuery> {
diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.java
index 2f3b8c40f0..1272bc6317 100644
--- a/core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -50,7 +50,7 @@ import io.onedev.server.util.diff.WhitespaceOption;
*/
@Entity
@Table(indexes={
- @Index(columnList="g_project_id"), @Index(columnList="g_user_id"),
+ @Index(columnList="o_project_id"), @Index(columnList="o_user_id"),
@Index(columnList="commit"), @Index(columnList="path"),
@Index(columnList="createDate"), @Index(columnList="updateDate")})
@DynamicUpdate
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java b/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
index 21b4b3e826..531b20d231 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
@@ -19,8 +19,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
public class CodeCommentQuerySetting extends QuerySetting<NamedCodeCommentQuery> {
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java
index 9fec24adee..069a77a80b 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java
@@ -9,8 +9,8 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
@Table(
- indexes={@Index(columnList="g_request_id"), @Index(columnList="g_comment_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_request_id", "g_comment_id"})
+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_comment_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_comment_id"})
})
@Entity
public class CodeCommentRelation extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentReply.java b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java
index 1697238179..09e48951a8 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentReply.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java
@@ -13,7 +13,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity
-@Table(indexes={@Index(columnList="g_comment_id"), @Index(columnList="g_user_id")})
+@Table(indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")})
public class CodeCommentReply extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java b/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
index 03219d413e..d47e111665 100644
--- a/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
@@ -20,8 +20,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
public class CommitQuerySetting extends QuerySetting<NamedCommitQuery> {
diff --git a/core/src/main/java/io/onedev/server/model/Configuration.java b/core/src/main/java/io/onedev/server/model/Configuration.java
index adb17c196c..19498b0453 100644
--- a/core/src/main/java/io/onedev/server/model/Configuration.java
+++ b/core/src/main/java/io/onedev/server/model/Configuration.java
@@ -27,8 +27,8 @@ import io.onedev.server.web.editable.annotation.Editable;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="name")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})}
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="name")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "name"})}
)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 08c1d218c7..28be09dc4b 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -58,13 +58,13 @@ import io.onedev.server.web.editable.annotation.Editable;
@Entity
@Table(
indexes={
- @Index(columnList="g_project_id"), @Index(columnList="state"),
+ @Index(columnList="o_project_id"), @Index(columnList="state"),
@Index(columnList="title"), @Index(columnList="noSpaceTitle"),
@Index(columnList="number"), @Index(columnList="numberStr"),
- @Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),
+ @Index(columnList="submitDate"), @Index(columnList="o_submitter_id"),
@Index(columnList="voteCount"), @Index(columnList="commentCount"),
- @Index(columnList="g_milestone_id"), @Index(columnList="updateDate")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "number"})})
+ @Index(columnList="o_milestone_id"), @Index(columnList="updateDate")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})
@Editable
public class Issue extends AbstractEntity implements Referenceable {
diff --git a/core/src/main/java/io/onedev/server/model/IssueChange.java b/core/src/main/java/io/onedev/server/model/IssueChange.java
index d781f8a301..c334180cc4 100644
--- a/core/src/main/java/io/onedev/server/model/IssueChange.java
+++ b/core/src/main/java/io/onedev/server/model/IssueChange.java
@@ -15,7 +15,7 @@ import io.onedev.server.model.support.issue.changedata.IssueChangeData;
@Entity
@Table(indexes={
- @Index(columnList="g_issue_id"), @Index(columnList="g_user_id")})
+ @Index(columnList="o_issue_id"), @Index(columnList="o_user_id")})
public class IssueChange extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/IssueComment.java b/core/src/main/java/io/onedev/server/model/IssueComment.java
index 4dc3134e1a..9cff42a586 100644
--- a/core/src/main/java/io/onedev/server/model/IssueComment.java
+++ b/core/src/main/java/io/onedev/server/model/IssueComment.java
@@ -13,7 +13,7 @@ import javax.persistence.Table;
@Entity
@Table(indexes={
- @Index(columnList="g_issue_id"), @Index(columnList="g_user_id")})
+ @Index(columnList="o_issue_id"), @Index(columnList="o_user_id")})
public class IssueComment extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java
index 9068a1dca3..cf1d649b7a 100644
--- a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java
+++ b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java
@@ -12,7 +12,7 @@ import javax.persistence.Table;
@Entity
@Table(
indexes={
- @Index(columnList="g_issue_id"), @Index(columnList="name"),
+ @Index(columnList="o_issue_id"), @Index(columnList="name"),
@Index(columnList="value"), @Index(columnList="type"),
@Index(columnList="ordinal")})
public class IssueFieldUnary extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
index d336f9c635..19b34aa9e9 100644
--- a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
@@ -20,8 +20,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {
diff --git a/core/src/main/java/io/onedev/server/model/IssueVote.java b/core/src/main/java/io/onedev/server/model/IssueVote.java
index 9eedeac807..d05d2926c3 100644
--- a/core/src/main/java/io/onedev/server/model/IssueVote.java
+++ b/core/src/main/java/io/onedev/server/model/IssueVote.java
@@ -13,8 +13,8 @@ import javax.persistence.UniqueConstraint;
@Entity
@Table(
- indexes={@Index(columnList="g_issue_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_issue_id", "g_user_id"})}
+ indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})}
)
public class IssueVote extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/IssueWatch.java b/core/src/main/java/io/onedev/server/model/IssueWatch.java
index 093c5bbcc8..fdab82c859 100644
--- a/core/src/main/java/io/onedev/server/model/IssueWatch.java
+++ b/core/src/main/java/io/onedev/server/model/IssueWatch.java
@@ -12,8 +12,8 @@ import io.onedev.server.model.support.EntityWatch;
@Entity
@Table(
- indexes={@Index(columnList="g_issue_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_issue_id", "g_user_id"})
+ indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})
})
public class IssueWatch extends EntityWatch {
diff --git a/core/src/main/java/io/onedev/server/model/Membership.java b/core/src/main/java/io/onedev/server/model/Membership.java
index 827a15aff0..054a299782 100644
--- a/core/src/main/java/io/onedev/server/model/Membership.java
+++ b/core/src/main/java/io/onedev/server/model/Membership.java
@@ -12,8 +12,8 @@ import io.onedev.server.util.facade.MembershipFacade;
@Entity
@Table(
- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_team_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_team_id"})
+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_team_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_team_id"})
})
public class Membership extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/Milestone.java b/core/src/main/java/io/onedev/server/model/Milestone.java
index 00315d3a99..1ca2c90c27 100644
--- a/core/src/main/java/io/onedev/server/model/Milestone.java
+++ b/core/src/main/java/io/onedev/server/model/Milestone.java
@@ -23,8 +23,8 @@ import io.onedev.server.web.editable.annotation.Multiline;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})}
+ indexes={@Index(columnList="o_project_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "name"})}
)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index 675714b3ee..ddf267a263 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -113,7 +113,7 @@ import io.onedev.utils.Range;
import io.onedev.utils.StringUtils;
@Entity
-@Table(indexes={@Index(columnList="g_forkedFrom_id")})
+@Table(indexes={@Index(columnList="o_forkedFrom_id")})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@DynamicUpdate
@Editable
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index 1d509b9784..5f48a84280 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -70,13 +70,13 @@ import io.onedev.server.util.jackson.RestView;
indexes={
@Index(columnList="title"), @Index(columnList="uuid"),
@Index(columnList="numberStr"), @Index(columnList="noSpaceTitle"),
- @Index(columnList="number"), @Index(columnList="g_targetProject_id"),
+ @Index(columnList="number"), @Index(columnList="o_targetProject_id"),
@Index(columnList="submitDate"), @Index(columnList="updateDate"),
- @Index(columnList="g_sourceProject_id"), @Index(columnList="g_submitter_id"),
+ @Index(columnList="o_sourceProject_id"), @Index(columnList="o_submitter_id"),
@Index(columnList="headCommitHash"), @Index(columnList="PREVIEW_REQUEST_HEAD"),
@Index(columnList="CLOSE_DATE"), @Index(columnList="CLOSE_STATUS"),
@Index(columnList="CLOSE_USER"), @Index(columnList="CLOSE_USER_NAME")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_targetProject_id", "number"})})
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_targetProject_id", "number"})})
public class PullRequest extends AbstractEntity implements Referenceable {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java
index b0f93041a0..a0b97e290a 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java
@@ -10,8 +10,8 @@ import javax.persistence.UniqueConstraint;
@Entity
@Table(
- indexes={@Index(columnList="g_request_id"), @Index(columnList="g_configuration_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_configuration_id", "g_request_id"})}
+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_configuration_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_configuration_id", "o_request_id"})}
)
public class PullRequestBuild extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestChange.java b/core/src/main/java/io/onedev/server/model/PullRequestChange.java
index f45e2c63a6..a4f5c9dc55 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestChange.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestChange.java
@@ -15,7 +15,7 @@ import javax.persistence.Table;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
@Entity
-@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})
+@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")})
public class PullRequestChange extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestComment.java b/core/src/main/java/io/onedev/server/model/PullRequestComment.java
index 274a6c661b..31c9aaf378 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestComment.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestComment.java
@@ -13,7 +13,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity
-@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})
+@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")})
public class PullRequestComment extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
index 03eee12e16..bcc4dd169a 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
@@ -20,8 +20,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery> {
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestReview.java b/core/src/main/java/io/onedev/server/model/PullRequestReview.java
index f77a3f374b..d1d5fbe6b8 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestReview.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestReview.java
@@ -18,8 +18,8 @@ import io.onedev.server.model.support.pullrequest.ReviewResult;
@Entity
@Table(
- indexes={@Index(columnList="g_user_id"), @Index(columnList="g_request_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_request_id"})}
+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_request_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_request_id"})}
)
public class PullRequestReview extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
index 2a54cdc981..8ac3033ba5 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
@@ -35,7 +35,7 @@ import io.onedev.server.git.command.ListFileChangesCommand;
import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager;
@Entity
-@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="date")})
+@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="date")})
public class PullRequestUpdate extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestWatch.java b/core/src/main/java/io/onedev/server/model/PullRequestWatch.java
index 94eff6a78b..8dac3c33ba 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestWatch.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestWatch.java
@@ -12,8 +12,8 @@ import io.onedev.server.model.support.EntityWatch;
@Entity
@Table(
- indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_request_id", "g_user_id"})
+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_user_id"})
})
public class PullRequestWatch extends EntityWatch {
diff --git a/core/src/main/java/io/onedev/server/model/Team.java b/core/src/main/java/io/onedev/server/model/Team.java
index cdbd2f2e5e..d6f13d3f19 100644
--- a/core/src/main/java/io/onedev/server/model/Team.java
+++ b/core/src/main/java/io/onedev/server/model/Team.java
@@ -28,8 +28,8 @@ import io.onedev.server.web.editable.annotation.Editable;
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
@Table(
- indexes={@Index(columnList="g_project_id"), @Index(columnList="name")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "name"})})
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="name")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "name"})})
public class Team extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java
index ed8931885f..a9db18ee63 100644
--- a/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java
@@ -8,6 +8,9 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import io.onedev.server.web.util.resourcebundle.ResourceBundle;
+
+@ResourceBundle
public class EChartsResourceReference extends JavaScriptResourceReference {
private static final long serialVersionUID = 1L;