Restore original parameter name txn

Author: vim89

cask/src-3.7/cask/database/package.scala

@@ -18,8 +18,8 @@ package cask
  *
  * @cask.database.transactional
  * @cask.get("/todos")
- * def list()(using ctx: Txn) = {
- *   ctx.run(Todo.select)
+ * def list()(txn: Txn) = {
+ *   txn.run(Todo.select)
  * }
  * }}}
  *

cask/src-3.7/cask/database/transactional.scala

@@ -20,16 +20,16 @@ import scalasql.core.DbClient
  *
  * @cask.database.transactional
  * @cask.get("/todos")
- * def list()(using ctx: Txn) = {
- *   ctx.run(Todo.select)
+ * def list()(txn: Txn) = {
+ *   txn.run(Todo.select)
  * }
  * }}}
  */
 class transactional(using dbClient: DbClient) extends RawDecorator {
 
   def wrapFunction(ctx: Request, delegate: Delegate): Result[Raw] = {
     dbClient.transaction { txn =>
-      val result = delegate(ctx, Map("ctx" -> txn))
+      val result = delegate(ctx, Map("txn" -> txn))
 
       val shouldRollback = result match {
         case _: cask.router.Result.Error => true

example/todoDb/app/src/TodoMvcDb.scala

@@ -36,20 +36,20 @@ object TodoMvcDb extends cask.MainRoutes {
 
   @transactional
   @cask.get("/list/:state")
-  def list(state: String)(using ctx: Txn) = {
+  def list(state: String)(txn: Txn) = {
     val filteredTodos = state match {
-      case "all" => ctx.run(Todo.select)
-      case "active" => ctx.run(Todo.select.filter(!_.checked))
-      case "completed" => ctx.run(Todo.select.filter(_.checked))
+      case "all" => txn.run(Todo.select)
+      case "active" => txn.run(Todo.select.filter(!_.checked))
+      case "completed" => txn.run(Todo.select.filter(_.checked))
     }
     upickle.default.write(filteredTodos)
   }
 
   @transactional
   @cask.post("/add")
-  def add(request: cask.Request)(using ctx: Txn) = {
+  def add(request: cask.Request)(txn: Txn) = {
     val body = request.text()
-    ctx.run(
+    txn.run(
       Todo
         .insert
         .columns(_.checked := false, _.text := body)
@@ -62,14 +62,14 @@ object TodoMvcDb extends cask.MainRoutes {
 
   @transactional
   @cask.post("/toggle/:index")
-  def toggle(index: Int)(using ctx: Txn) = {
-    ctx.run(Todo.update(_.id === index).set(p => p.checked := !p.checked))
+  def toggle(index: Int)(txn: Txn) = {
+    txn.run(Todo.update(_.id === index).set(p => p.checked := !p.checked))
   }
 
   @transactional
   @cask.post("/delete/:index")
-  def delete(index: Int)(using ctx: Txn) = {
-    ctx.run(Todo.delete(_.id === index))
+  def delete(index: Int)(txn: Txn) = {
+    txn.run(Todo.delete(_.id === index))
   }
 
   initialize()

example/todoDbWithLoom/app/src/TodoMvcDbWithLoom.scala

@@ -43,20 +43,20 @@ object TodoMvcDbWithLoom extends cask.MainRoutes {
 
   @transactional
   @cask.get("/list/:state")
-  def list(state: String)(using ctx: Txn) = {
+  def list(state: String)(txn: Txn) = {
     val filteredTodos = state match {
-      case "all" => ctx.run(Todo.select)
-      case "active" => ctx.run(Todo.select.filter(!_.checked))
-      case "completed" => ctx.run(Todo.select.filter(_.checked))
+      case "all" => txn.run(Todo.select)
+      case "active" => txn.run(Todo.select.filter(!_.checked))
+      case "completed" => txn.run(Todo.select.filter(_.checked))
     }
     upickle.default.write(filteredTodos)
   }
 
   @transactional
   @cask.post("/add")
-  def add(request: cask.Request)(using ctx: Txn) = {
+  def add(request: cask.Request)(txn: Txn) = {
     val body = request.text()
-    ctx.run(
+    txn.run(
       Todo
         .insert
         .columns(_.checked := false, _.text := body)
@@ -69,14 +69,14 @@ object TodoMvcDbWithLoom extends cask.MainRoutes {
 
   @transactional
   @cask.post("/toggle/:index")
-  def toggle(index: Int)(using ctx: Txn) = {
-    ctx.run(Todo.update(_.id === index).set(p => p.checked := !p.checked))
+  def toggle(index: Int)(txn: Txn) = {
+    txn.run(Todo.update(_.id === index).set(p => p.checked := !p.checked))
   }
 
   @transactional
   @cask.post("/delete/:index")
-  def delete(index: Int)(using ctx: Txn) = {
-    ctx.run(Todo.delete(_.id === index))
+  def delete(index: Int)(txn: Txn) = {
+    txn.run(Todo.delete(_.id === index))
   }
 
   initialize()