From 89dfaeeb93fb6d19fa3ab9411e9727e6e13a27d9 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 13 Aug 2016 04:31:22 +0900
Subject: [PATCH] Turn to use returning instead of returningId

---
 .../scala/gitbucket/core/service/AccessTokenService.scala | 2 +-
 .../gitbucket/core/service/CommitStatusService.scala      | 2 +-
 .../scala/gitbucket/core/service/CommitsService.scala     | 8 +-------
 src/main/scala/gitbucket/core/service/IssuesService.scala | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/gitbucket/core/service/AccessTokenService.scala b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
index ca20af309..822456c54 100644
--- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala
+++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
@@ -35,7 +35,7 @@ trait AccessTokenService {
         userName = userName,
         note = note,
         tokenHash = hash)
-    val tokenId = (AccessTokens returningId AccessTokens.map(_.accessTokenId)) unsafeInsert newToken
+    val tokenId = (AccessTokens returning AccessTokens.map(_.accessTokenId)) unsafeInsert newToken
     (tokenId, token)
   }
 
diff --git a/src/main/scala/gitbucket/core/service/CommitStatusService.scala b/src/main/scala/gitbucket/core/service/CommitStatusService.scala
index f7d730c81..45b5bb706 100644
--- a/src/main/scala/gitbucket/core/service/CommitStatusService.scala
+++ b/src/main/scala/gitbucket/core/service/CommitStatusService.scala
@@ -24,7 +24,7 @@ trait CommitStatusService {
           }.update((state, targetUrl, now, creator.userName, description))
           id
         }
-        case None => (CommitStatuses returningId CommitStatuses.map(_.commitStatusId)) unsafeInsert CommitStatus(
+        case None => (CommitStatuses returning CommitStatuses.map(_.commitStatusId)) unsafeInsert CommitStatus(
             userName       = userName,
             repositoryName = repositoryName,
             commitId       = sha,
diff --git a/src/main/scala/gitbucket/core/service/CommitsService.scala b/src/main/scala/gitbucket/core/service/CommitsService.scala
index 89467cb38..f2f37b308 100644
--- a/src/main/scala/gitbucket/core/service/CommitsService.scala
+++ b/src/main/scala/gitbucket/core/service/CommitsService.scala
@@ -1,15 +1,9 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.CommitComment
-import gitbucket.core.util.{StringUtil, Implicits}
-
-//import slick.jdbc.{StaticQuery => Q}
-//import Q.interpolation
 import gitbucket.core.model.Profile._
 import profile._
 import profile.api._
-//import Implicits._
-//import StringUtil._
 
 
 trait CommitsService {
@@ -30,7 +24,7 @@ trait CommitsService {
   def createCommitComment(owner: String, repository: String, commitId: String, loginUser: String,
                           content: String, fileName: Option[String], oldLine: Option[Int], newLine: Option[Int],
                           issueId: Option[Int])(implicit s: Session): Int =
-    CommitComments returningId CommitComments.map(_.commentId) unsafeInsert CommitComment(
+    CommitComments returning CommitComments.map(_.commentId) unsafeInsert CommitComment(
       userName          = owner,
       repositoryName    = repository,
       commitId          = commitId,
diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala
index 273295943..ddad69c45 100644
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -265,7 +265,7 @@ trait IssuesService {
 
   def createComment(owner: String, repository: String, loginUser: String,
       issueId: Int, content: String, action: String)(implicit s: Session): Int = {
-    IssueComments returningId IssueComments.map(_.commentId) unsafeInsert IssueComment(
+    IssueComments returning IssueComments.map(_.commentId) unsafeInsert IssueComment(
       userName          = owner,
       repositoryName    = repository,
       issueId           = issueId,