Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Add columns MERGE_START_ID and MERGE_END_ID to PULL_REQUEST.

Browse Source
This commit is contained in:
takezoe
2013-07-15 04:49:14 +09:00
parent dc59d1f3ca
commit 9bb6b216e9
4 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/model/PullRequest.scala
View File

@@ -7,7 +7,9 @@ object PullRequests extends Table[PullRequest]("PULL_REQUEST") with IssueTemplat
def requestUserName = column[String]("REQUEST_USER_NAME")
def requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
def requestBranch = column[String]("REQUEST_BRANCH")
def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch <> (PullRequest, PullRequest.unapply _)
def mergeStartId = column[String]("MERGE_START_ID")
def mergeEndId = column[String]("MERGE_END_ID")
def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch ~ mergeStartId.? ~ mergeEndId.? <> (PullRequest, PullRequest.unapply _)
def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
@@ -20,4 +22,6 @@ case class PullRequest(
branch: String,
requestUserName: String,
requestRepositoryName: String,
requestBranch: String)
requestBranch: String,
mergeStartId: Option[String],
mergeEndId: Option[String])