Query' altered execution: Allow changing result type

Author: jatcwang

modules/core/src/main/scala/doobie/util/query.scala

@@ -107,10 +107,10 @@ object query {
 
     /** Just like `to` but allowing to alter `PreparedExecution`.
       */
-    def toAlteringExecution[F[_]](
+    def toAlteringExecution[F[_], R](
         a: A,
-        fn: PreparedExecution[F[B]] => PreparedExecution[F[B]]
-    )(implicit f: FactoryCompat[B, F[B]]): ConnectionIO[F[B]] = {
+        fn: PreparedExecution[F[B]] => PreparedExecution[R]
+    )(implicit f: FactoryCompat[B, F[B]]): ConnectionIO[R] = {
       toConnectionIOAlteringExecution(a, IHRS.build[F, B], fn)
     }
 
@@ -124,13 +124,13 @@ object query {
 
     /** Just like `toMap` but allowing to alter `PreparedExecution`.
       */
-    def toMapAlteringExecution[K, V](
+    def toMapAlteringExecution[K, V, R](
         a: A,
-        fn: PreparedExecution[Map[K, V]] => PreparedExecution[Map[K, V]]
+        fn: PreparedExecution[Map[K, V]] => PreparedExecution[R]
     )(implicit
         ev: B =:= (K, V),
         f: FactoryCompat[(K, V), Map[K, V]]
-    ): ConnectionIO[Map[K, V]] =
+    ): ConnectionIO[R] =
       toConnectionIOAlteringExecution(a, IHRS.buildPair[Map, K, V](f, read.map(ev)), fn)
 
     /** Apply the argument `a` to construct a program in `[[doobie.free.connection.ConnectionIO ConnectionIO]]` yielding
@@ -142,10 +142,10 @@ object query {
 
     /** Just like `accumulate` but allowing to alter `PreparedExecution`.
       */
-    def accumulateAlteringExecution[F[_]: Alternative](
+    def accumulateAlteringExecution[F[_]: Alternative, R](
         a: A,
-        fn: PreparedExecution[F[B]] => PreparedExecution[F[B]]
-    ): ConnectionIO[F[B]] =
+        fn: PreparedExecution[F[B]] => PreparedExecution[R]
+    ): ConnectionIO[R] =
       toConnectionIOAlteringExecution(a, IHRS.accumulate[F, B], fn)
 
     /** Apply the argument `a` to construct a program in `[[doobie.free.connection.ConnectionIO ConnectionIO]]` yielding
@@ -157,7 +157,7 @@ object query {
 
     /** Just like `unique` but allowing to alter `PreparedExecution`.
       */
-    def uniqueAlteringExecution(a: A, fn: PreparedExecution[B] => PreparedExecution[B]): ConnectionIO[B] =
+    def uniqueAlteringExecution[R](a: A, fn: PreparedExecution[B] => PreparedExecution[R]): ConnectionIO[R] =
       toConnectionIOAlteringExecution(a, IHRS.getUnique[B], fn)
 
     /** Apply the argument `a` to construct a program in `[[doobie.free.connection.ConnectionIO ConnectionIO]]` yielding
@@ -169,10 +169,10 @@ object query {
 
     /** Just like `option` but allowing to alter `PreparedExecution`.
       */
-    def optionAlteringExecution(
+    def optionAlteringExecution[R](
         a: A,
-        fn: PreparedExecution[Option[B]] => PreparedExecution[Option[B]]
-    ): ConnectionIO[Option[B]] =
+        fn: PreparedExecution[Option[B]] => PreparedExecution[R]
+    ): ConnectionIO[R] =
       toConnectionIOAlteringExecution(a, IHRS.getOption[B], fn)
 
     /** Apply the argument `a` to construct a program in `[[doobie.free.connection.ConnectionIO ConnectionIO]]` yielding
@@ -185,20 +185,20 @@ object query {
 
     /** Just like `nel` but allowing to alter `PreparedExecution`.
       */
-    def nelAlteringExecution(
+    def nelAlteringExecution[R](
         a: A,
-        fn: PreparedExecution[NonEmptyList[B]] => PreparedExecution[NonEmptyList[B]]
-    ): ConnectionIO[NonEmptyList[B]] =
+        fn: PreparedExecution[NonEmptyList[B]] => PreparedExecution[R]
+    ): ConnectionIO[R] =
       toConnectionIOAlteringExecution(a, IHRS.nel[B], fn)
 
     private def toConnectionIO[C](a: A, rsio: ResultSetIO[C]): ConnectionIO[C] =
       IHC.executeWithResultSet(preparedExecution(sql, a, rsio), mkLoggingInfo(a))
 
-    private def toConnectionIOAlteringExecution[C](
+    private def toConnectionIOAlteringExecution[C, R](
         a: A,
         rsio: ResultSetIO[C],
-        fn: PreparedExecution[C] => PreparedExecution[C]
-    ): ConnectionIO[C] =
+        fn: PreparedExecution[C] => PreparedExecution[R]
+    ): ConnectionIO[R] =
       IHC.executeWithResultSet(fn(preparedExecution(sql, a, rsio)), mkLoggingInfo(a))
 
     private def preparedExecution[C](sql: String, a: A, rsio: ResultSetIO[C]): PreparedExecution[C] =

modules/core/src/test/scala/doobie/util/QuerySuite.scala

@@ -13,6 +13,8 @@ import doobie.implicits.*
 
 class QuerySuite extends munit.CatsEffectSuite {
 
+  import doobie.FPS
+
   val xa = Transactor.fromDriverManager[IO](
     driver = "org.h2.Driver",
     url = "jdbc:h2:mem:queryspec;DB_CLOSE_DELAY=-1",
@@ -64,7 +66,7 @@ class QuerySuite extends munit.CatsEffectSuite {
 
   test("Query toAlteringExecution (result set operations)") {
     var didRun = false
-    pairQuery.toAlteringExecution[List](
+    pairQuery.toAlteringExecution[List, List[(String, Int)]](
       "x",
       { preparedExec =>
         val process = IHRS.delay { didRun = true } *> preparedExec.process
@@ -78,7 +80,7 @@ class QuerySuite extends munit.CatsEffectSuite {
   }
   test("Query toMapAlteringExecution (result set operations)") {
     var didRun = false
-    pairQuery.toMapAlteringExecution[String, Int](
+    pairQuery.toMapAlteringExecution[String, Int, Map[String, Int]](
       "x",
       { preparedExec =>
         val process = IHRS.delay { didRun = true } *> preparedExec.process
@@ -92,7 +94,7 @@ class QuerySuite extends munit.CatsEffectSuite {
   }
   test("Query accumulateAlteringExecution (result set operations)") {
     var didRun = false
-    pairQuery.accumulateAlteringExecution[List](
+    pairQuery.accumulateAlteringExecution[List, List[(String, Int)]](
       "x",
       { preparedExec =>
         val process = IHRS.delay { didRun = true } *> preparedExec.process