summaryrefslogtreecommitdiff
path: root/example/todo
diff options
context:
space:
mode:
Diffstat (limited to 'example/todo')
-rw-r--r--example/todo/app/src/TodoServer.scala15
-rw-r--r--example/todo/app/test/src/ExampleTests.scala2
-rw-r--r--example/todo/build.sc2
3 files changed, 11 insertions, 8 deletions
diff --git a/example/todo/app/src/TodoServer.scala b/example/todo/app/src/TodoServer.scala
index 1a58d09..2df6fb2 100644
--- a/example/todo/app/src/TodoServer.scala
+++ b/example/todo/app/src/TodoServer.scala
@@ -1,5 +1,4 @@
package app
-import cask.internal.Router
import com.typesafe.config.ConfigFactory
import io.getquill.{SnakeCase, SqliteJdbcContext}
import scalatags.Text.all._
@@ -15,13 +14,13 @@ object TodoServer extends cask.MainRoutes{
)
)
- class transactional extends cask.Decorator{
- class TransactionFailed(val value: Router.Result.Error) extends Exception
+ class transactional extends cask.RawDecorator{
+ class TransactionFailed(val value: cask.router.Result.Error) extends Exception
def wrapFunction(pctx: cask.Request, delegate: Delegate): OuterReturned = {
try ctx.transaction(
delegate(Map()) match{
- case Router.Result.Success(t) => Router.Result.Success(t)
- case e: Router.Result.Error => throw new TransactionFailed(e)
+ case cask.router.Result.Success(t) => cask.router.Result.Success(t)
+ case e: cask.router.Result.Error => throw new TransactionFailed(e)
}
)
catch{case e: TransactionFailed => e.value}
@@ -55,7 +54,11 @@ object TodoServer extends cask.MainRoutes{
@cask.post("/add/:state")
def add(state: String, request: cask.Request) = {
val body = new String(request.readAllBytes())
- run(query[Todo].insert(_.checked -> lift(false), _.text -> lift(body)).returning(_.id))
+ run(
+ query[Todo]
+ .insert(_.checked -> lift(false), _.text -> lift(body))
+ .returningGenerated(_.id)
+ )
renderBody(state).render
}
diff --git a/example/todo/app/test/src/ExampleTests.scala b/example/todo/app/test/src/ExampleTests.scala
index e1be23c..0c39c87 100644
--- a/example/todo/app/test/src/ExampleTests.scala
+++ b/example/todo/app/test/src/ExampleTests.scala
@@ -1,7 +1,7 @@
package app
import utest._
object ExampleTests extends TestSuite{
- def withServer[T](example: cask.main.BaseMain)(f: String => T): T = {
+ def withServer[T](example: cask.main.Main)(f: String => T): T = {
val server = io.undertow.Undertow.builder
.addHttpListener(8080, "localhost")
.setHandler(example.defaultHandler)
diff --git a/example/todo/build.sc b/example/todo/build.sc
index c5d5610..9bfe43b 100644
--- a/example/todo/build.sc
+++ b/example/todo/build.sc
@@ -5,7 +5,7 @@ trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
def ivyDeps = Agg[Dep](
ivy"org.xerial:sqlite-jdbc:3.18.0",
- ivy"io.getquill::quill-jdbc:2.5.4",
+ ivy"io.getquill::quill-jdbc:3.4.10",
ivy"com.lihaoyi::scalatags:0.7.0",
)