move named tuple querable to new file

bishabosha · bishabosha · commit 9efa287bee44 · 2025-05-20T22:25:23.000+02:00
diff --git a/scalasql/namedtuples/src/NamedTupleQueryable.scala b/scalasql/namedtuples/src/NamedTupleQueryable.scala
@@ -0,0 +1,67 @@
+package scalasql.namedtuples
+
+import scala.NamedTuple.NamedTuple
+import scalasql.core.{Queryable, Expr}
+
+object NamedTupleQueryable {
+
+  opaque type Rows[X <: Tuple, +Y <: Tuple] = List[Queryable.Row[?, ?]]
+
+  object Rows {
+    // currently "traditional" recursive implicit search
+    // because we only know the Q type, and it appears compiletime.summonAll cannot be used to refined the R type
+    // e.g. compiletime.summonAll[Tuple.Map[Qs, [X] =>> Queryable.Row[X, ?]]] does nothing because its static type is fixed.
+    given concatRows: [Q, R, Qs <: Tuple, Rs <: Tuple]
+      => (x: Queryable.Row[Q, R])
+      => (xs: Rows[Qs, Rs])
+      => Rows[Q *: Qs, R *: Rs] =
+      x :: xs
+
+    given emptyRows: Rows[EmptyTuple, EmptyTuple] = Nil
+  }
+
+  given NamedTupleRow: [N <: Tuple, X <: Tuple, Y <: Tuple]
+    => (rs: Rows[X, Y]) => Queryable.Row[NamedTuple[N, X], NamedTuple[N, Y]]:
+    def walkExprs(q: NamedTuple[N, X]): Seq[Expr[?]] = {
+      val walkExprs0 = {
+        val ps = q.toTuple.productIterator
+        rs.iterator
+          .zip(ps)
+          .map({ (row, p) =>
+            type Q
+            type R
+            val q = p.asInstanceOf[Q]
+            row.asInstanceOf[Queryable.Row[Q, R]].walkExprs(q)
+          })
+      }
+
+      walkExprs0.zipWithIndex
+        .map { case (v, i) => (i.toString, v) }
+        .flatMap { case (prefix, vs0) => vs0 }
+        .toIndexedSeq
+    }
+    def walkLabels(): Seq[List[String]] = {
+      val walkLabels0 = rs.iterator.map(_.walkLabels())
+      walkLabels0.zipWithIndex
+        .map { case (v, i) => (i.toString, v) }
+        .flatMap { case (prefix, vs0) => vs0.map { k => prefix +: k } }
+        .toIndexedSeq
+    }
+    def construct(args: scalasql.core.Queryable.ResultSetIterator): NamedTuple.NamedTuple[N, Y] =
+      val data = IArray.from(rs.iterator.map(_.construct(args)))
+      Tuple.fromIArray(data).asInstanceOf[NamedTuple.NamedTuple[N, Y]]
+
+    def deconstruct(r: NamedTuple.NamedTuple[N, Y]): NamedTuple.NamedTuple[N, X] =
+      val data = IArray.from {
+        val ps = r.toTuple.productIterator
+        rs.iterator
+          .zip(ps)
+          .map({ (row, p) =>
+            type Q
+            type R
+            val r = p.asInstanceOf[R]
+            row.asInstanceOf[Queryable.Row[Q, R]].deconstruct(r)
+          })
+      }
+      Tuple.fromIArray(data).asInstanceOf[NamedTuple.NamedTuple[N, X]]
+}
diff --git a/scalasql/namedtuples/src/SimpleTable.scala b/scalasql/namedtuples/src/SimpleTable.scala
@@ -19,69 +19,6 @@ class SimpleTable[C]()(
 
 object SimpleTable {
 
-  object NamedTupleOps {
-
-    opaque type Rows[X <: Tuple, +Y <: Tuple] = List[Queryable.Row[?, ?]]
-
-    object Rows {
-      // currently "traditional" recursive implicit search
-      // because we only know the Q type, and it appears compiletime.summonAll cannot be used to refined the R type
-      // e.g. compiletime.summonAll[Tuple.Map[Qs, [X] =>> Queryable.Row[X, ?]]] does nothing because its static type is fixed.
-      given concatRows: [Q, R, Qs <: Tuple, Rs <: Tuple]
-        => (x: Queryable.Row[Q, R])
-        => (xs: Rows[Qs, Rs])
-        => Rows[Q *: Qs, R *: Rs] =
-        x :: xs
-
-      given emptyRows: Rows[EmptyTuple, EmptyTuple] = Nil
-    }
-
-    given NamedTupleExprRow: [N <: Tuple, X <: Tuple, Y <: Tuple]
-      => (rs: Rows[X, Y]) => Queryable.Row[NamedTuple[N, X], NamedTuple[N, Y]]:
-      def walkExprs(q: NamedTuple[N, X]): Seq[Expr[?]] = {
-        val walkExprs0 = {
-          val ps = q.toTuple.productIterator
-          rs.iterator
-            .zip(ps)
-            .map({ (row, p) =>
-              type Q
-              type R
-              val q = p.asInstanceOf[Q]
-              row.asInstanceOf[Queryable.Row[Q, R]].walkExprs(q)
-            })
-        }
-
-        walkExprs0.zipWithIndex
-          .map { case (v, i) => (i.toString, v) }
-          .flatMap { case (prefix, vs0) => vs0 }
-          .toIndexedSeq
-      }
-      def walkLabels(): Seq[List[String]] = {
-        val walkLabels0 = rs.iterator.map(_.walkLabels())
-        walkLabels0.zipWithIndex
-          .map { case (v, i) => (i.toString, v) }
-          .flatMap { case (prefix, vs0) => vs0.map { k => prefix +: k } }
-          .toIndexedSeq
-      }
-      def construct(args: scalasql.core.Queryable.ResultSetIterator): NamedTuple.NamedTuple[N, Y] =
-        val data = IArray.from(rs.iterator.map(_.construct(args)))
-        Tuple.fromIArray(data).asInstanceOf[NamedTuple.NamedTuple[N, Y]]
-
-      def deconstruct(r: NamedTuple.NamedTuple[N, Y]): NamedTuple.NamedTuple[N, X] =
-        val data = IArray.from {
-          val ps = r.toTuple.productIterator
-          rs.iterator
-            .zip(ps)
-            .map({ (row, p) =>
-              type Q
-              type R
-              val r = p.asInstanceOf[R]
-              row.asInstanceOf[Queryable.Row[Q, R]].deconstruct(r)
-            })
-        }
-        Tuple.fromIArray(data).asInstanceOf[NamedTuple.NamedTuple[N, X]]
-  }
-
   /**
    * Marker class that signals that a data type is convertable to an SQL table row.
    * @note this must be a class to convince the match type reducer that it provably can't be mixed
diff --git a/scalasql/namedtuples/test/src/datatypes/LargeObjectTest.scala b/scalasql/namedtuples/test/src/datatypes/LargeObjectTest.scala
@@ -431,7 +431,7 @@ object LargeObjectB extends SimpleTable[LargeObjectB]
 // so hopefully 75 is large enough. (works with -Xss900k)
 def foo: Unit = {
   import scalasql.dialects.H2Dialect.*
-  import scalasql.namedtuples.SimpleTable.NamedTupleOps.given
+  import scalasql.namedtuples.NamedTupleQueryable.given
   val db: DbApi = ???
   val m = db.run(
     LargeObjectB.select.map(_ =>
diff --git a/scalasql/namedtuples/test/src/example/SimpleTableH2Example.scala b/scalasql/namedtuples/test/src/example/SimpleTableH2Example.scala
@@ -2,7 +2,7 @@
 package scalasql.namedtuples.example
 
 import scalasql.namedtuples.SimpleTable
-import scalasql.namedtuples.SimpleTable.NamedTupleOps.given
+import scalasql.namedtuples.NamedTupleQueryable.given
 import scalasql.H2Dialect.*
 
 object SimpleTableH2Example {
diff --git a/scalasql/namedtuples/test/src/example/SimpleTableMySqlExample.scala b/scalasql/namedtuples/test/src/example/SimpleTableMySqlExample.scala
@@ -2,7 +2,7 @@
 package scalasql.namedtuples.example
 
 import scalasql.namedtuples.SimpleTable
-import scalasql.namedtuples.SimpleTable.NamedTupleOps.given
+import scalasql.namedtuples.NamedTupleQueryable.given
 import org.testcontainers.containers.MySQLContainer
 import scalasql.MySqlDialect.*
 
diff --git a/scalasql/namedtuples/test/src/example/SimpleTablePostgresExample.scala b/scalasql/namedtuples/test/src/example/SimpleTablePostgresExample.scala
@@ -3,7 +3,7 @@ package scalasql.namedtuples.example
 
 import org.testcontainers.containers.PostgreSQLContainer
 import scalasql.namedtuples.SimpleTable
-import scalasql.namedtuples.SimpleTable.NamedTupleOps.given
+import scalasql.namedtuples.NamedTupleQueryable.given
 
 import scalasql.PostgresDialect.*
 
diff --git a/scalasql/namedtuples/test/src/example/SimpleTableSqliteExample.scala b/scalasql/namedtuples/test/src/example/SimpleTableSqliteExample.scala
@@ -2,7 +2,7 @@
 package scalasql.namedtuples.example
 
 import scalasql.namedtuples.SimpleTable
-import scalasql.namedtuples.SimpleTable.NamedTupleOps.given
+import scalasql.namedtuples.NamedTupleQueryable.given
 
 import scalasql.SqliteDialect.*
 object SimpleTableSqliteExample {
diff --git a/scalasql/namedtuples/test/src/example/foo.scala b/scalasql/namedtuples/test/src/example/foo.scala
@@ -2,7 +2,7 @@ package scalasql.example
 
 import scalasql.dialects.H2Dialect.*
 import scalasql.namedtuples.*
-import scalasql.namedtuples.SimpleTable.NamedTupleOps.given
+import scalasql.namedtuples.NamedTupleQueryable.given
 import scalasql.*
 import scalasql.dialects.Dialect
 
