diff --git a/build.sbt b/build.sbt index 68aad5f..1e2a8a9 100644 --- a/build.sbt +++ b/build.sbt @@ -36,7 +36,7 @@ "org.apache.sshd" % "apache-sshd" % "1.2.0", "org.apache.tika" % "tika-core" % "1.13", "com.typesafe.slick" %% "slick" % "3.1.1", - "com.github.takezoe" %% "blocking-slick" % "0.0.2", + "com.github.takezoe" %% "blocking-slick" % "0.0.3-SNAPSHOT", "com.novell.ldap" % "jldap" % "2009-10-07", "com.h2database" % "h2" % "1.4.192", "mysql" % "mysql-connector-java" % "5.1.39", diff --git a/src/main/scala/gitbucket/core/service/AccessTokenService.scala b/src/main/scala/gitbucket/core/service/AccessTokenService.scala index 7ce535f..c04fccc 100644 --- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala +++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala @@ -31,7 +31,7 @@ token = makeAccessTokenString hash = tokenToHash(token) //} while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run) - } while (Query(AccessTokens.filter(_.tokenHash === hash.bind).exists).first) + } while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run) val newToken = AccessToken( userName = userName, note = note, diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala index 271b946..fbdee92 100644 --- a/src/main/scala/gitbucket/core/service/PullRequestService.scala +++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala @@ -111,7 +111,7 @@ */ def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit = getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq => - if(Query(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists).first){ + if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){ //if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){ val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest( pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId,