diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-10-09 08:10:00 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-10-09 08:10:00 +0800 |
commit | fad17164dfe9252d3e3b6f90c0b74f8378c059e3 (patch) | |
tree | 459efb8657500f67e22a8e544f5aece83f828f77 /example/todoDb/app/src/TodoMvcDb.scala | |
parent | d769f19643f51a8297abebbee01dc61d5bf5a2d5 (diff) | |
download | cask-fad17164dfe9252d3e3b6f90c0b74f8378c059e3.tar.gz cask-fad17164dfe9252d3e3b6f90c0b74f8378c059e3.tar.bz2 cask-fad17164dfe9252d3e3b6f90c0b74f8378c059e3.zip |
upgrade to quill 3.4.10, re-enable database examples
Diffstat (limited to 'example/todoDb/app/src/TodoMvcDb.scala')
-rw-r--r-- | example/todoDb/app/src/TodoMvcDb.scala | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/example/todoDb/app/src/TodoMvcDb.scala b/example/todoDb/app/src/TodoMvcDb.scala index 669b2b8..0bb25c0 100644 --- a/example/todoDb/app/src/TodoMvcDb.scala +++ b/example/todoDb/app/src/TodoMvcDb.scala @@ -1,5 +1,4 @@ package app -import cask.internal.Router import com.typesafe.config.ConfigFactory import io.getquill.{SqliteJdbcContext, SnakeCase} @@ -14,13 +13,13 @@ object TodoMvcDb 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} @@ -65,7 +64,11 @@ object TodoMvcDb extends cask.MainRoutes{ @cask.post("/add") def add(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) + ) } @transactional |