0.2.5

lihaoyi · lihaoyi · commit 5b20e206e5df · 2025-12-26T21:47:47.000+08:00
diff --git a/build.mill b/build.mill
@@ -77,7 +77,7 @@ trait Common extends CommonBase with CrossScalaModule
 
 object `scalasql-simple` extends CommonBase {
   def scalaVersion: T[String] = scala3Simple
-  def millSourcePath: os.Path = scalasql(scala3).millSourcePath / "namedtuples"
+  def millSourcePath: os.Path = scalasql(scala3).millSourcePath / "simple"
   def moduleDeps: Seq[PublishModule] = Seq(scalasql(scala3))
 
   // override def scalacOptions: Target[Seq[String]] = T {
diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -505,7 +505,7 @@ db.run(query) ==>
 You can also use named tuples to map the results of a query.
 ```scala
 // `NamedTupleQueryable` is also included by `import scalasql.simple.given`
-import scalasql.namedtuples.NamedTupleQueryable.given
+import scalasql.simple.NamedTupleQueryable.given
 
 val query = Country.select.map(c => (name = c.name, continent = c.continent))
 
diff --git a/readme.md b/readme.md
@@ -177,7 +177,7 @@ And you now have the option to return named tuples from queries:
 
 ## Changelog
 
-### 0.2.4
+### 0.2.5
 
 * Rename `scalasql-namedtuples` artifact name to `scalasql-simple`
 
diff --git a/scalasql/simple/src/SimpleTableMacros.scala b/scalasql/simple/src/SimpleTableMacros.scala
@@ -13,7 +13,7 @@ import scala.reflect.ClassTag
 import scala.NamedTuple.AnyNamedTuple
 import java.util.function.UnaryOperator
 import scala.annotation.nowarn
-import scalasql.namedtuples.SimpleTableMacros.BaseLabels
+import scalasql.simple.SimpleTableMacros.BaseLabels
 import scalasql.core.TypeMapper
 import scala.annotation.unused
 import scala.annotation.implicitNotFound
diff --git a/scalasql/simple/src/exports.scala b/scalasql/simple/src/exports.scala
@@ -0,0 +1,5 @@
+package scalasql
+
+package object simple:
+  export scalasql.`package`.{*, given}
+  export scalasql.simple.NamedTupleQueryable.given
diff --git a/scalasql/simple/test/src/SimpleTableConcreteTestSuites.scala b/scalasql/simple/test/src/SimpleTableConcreteTestSuites.scala
@@ -1,4 +1,4 @@
-package scalasql.namedtuples
+package scalasql.simple
 import scalasql.api.{TransactionTests, DbApiTests}
 import scalasql.operations.{
   ExprBooleanOpsTests,
@@ -82,11 +82,11 @@ package postgres {
   // object ExprMathOpsTests extends ExprMathOpsTests with PostgresSuite
 
   object DataTypesTests
-      extends scalasql.namedtuples.datatypes.SimpleTableDataTypesTests
+      extends scalasql.simple.datatypes.SimpleTableDataTypesTests
       with PostgresSuite
 
   object OptionalTests
-      extends scalasql.namedtuples.datatypes.SimpleTableOptionalTests
+      extends scalasql.simple.datatypes.SimpleTableOptionalTests
       with PostgresSuite
 
   // object PostgresDialectTests extends PostgresDialectTests
@@ -135,11 +135,11 @@ package hikari {
   // object ExprMathOpsTests extends ExprMathOpsTests with HikariSuite
 
   object DataTypesTests
-      extends scalasql.namedtuples.datatypes.SimpleTableDataTypesTests
+      extends scalasql.simple.datatypes.SimpleTableDataTypesTests
       with HikariSuite
 
   object OptionalTests
-      extends scalasql.namedtuples.datatypes.SimpleTableOptionalTests
+      extends scalasql.simple.datatypes.SimpleTableOptionalTests
       with HikariSuite
 
   // object PostgresDialectTests extends PostgresDialectTests
@@ -189,10 +189,10 @@ package mysql {
   // object EscapedTableNameTests extends EscapedTableNameTests with MySqlSuite
 
   object DataTypesTests
-      extends scalasql.namedtuples.datatypes.SimpleTableDataTypesTests
+      extends scalasql.simple.datatypes.SimpleTableDataTypesTests
       with MySqlSuite
   object OptionalTests
-      extends scalasql.namedtuples.datatypes.SimpleTableOptionalTests
+      extends scalasql.simple.datatypes.SimpleTableOptionalTests
       with MySqlSuite
 
   // object MySqlDialectTests extends MySqlDialectTests
@@ -244,10 +244,10 @@ package sqlite {
   //     with SqliteSuite
 
   object DataTypesTests
-      extends scalasql.namedtuples.datatypes.SimpleTableDataTypesTests
+      extends scalasql.simple.datatypes.SimpleTableDataTypesTests
       with SqliteSuite
   object OptionalTests
-      extends scalasql.namedtuples.datatypes.SimpleTableOptionalTests
+      extends scalasql.simple.datatypes.SimpleTableOptionalTests
       with SqliteSuite
 
   // object SqliteDialectTests extends SqliteDialectTests
@@ -295,9 +295,9 @@ package h2 {
   // object ExprMathOpsTests extends ExprMathOpsTests with H2Suite
 
   object DataTypesTests
-      extends scalasql.namedtuples.datatypes.SimpleTableDataTypesTests
+      extends scalasql.simple.datatypes.SimpleTableDataTypesTests
       with H2Suite
-  object OptionalTests extends scalasql.namedtuples.datatypes.SimpleTableOptionalTests with H2Suite
+  object OptionalTests extends scalasql.simple.datatypes.SimpleTableOptionalTests with H2Suite
 
   // object H2DialectTests extends H2DialectTests
 }
diff --git a/scalasql/simple/test/src/SimpleTableExampleTests.scala b/scalasql/simple/test/src/SimpleTableExampleTests.scala
@@ -1,4 +1,4 @@
-package scalasql.namedtuples
+package scalasql.simple
 
 import utest._
 
diff --git a/scalasql/simple/test/src/datatypes/LargeObjectTest.scala b/scalasql/simple/test/src/datatypes/LargeObjectTest.scala
@@ -1,4 +1,4 @@
-package scalasql.namedtuples.datatypes
+package scalasql.simple.datatypes
 
 import scalasql.simple.{*, given}
 
diff --git a/scalasql/simple/test/src/datatypes/SimpleTableDataTypesTests.scala b/scalasql/simple/test/src/datatypes/SimpleTableDataTypesTests.scala
@@ -1,4 +1,4 @@
-package scalasql.namedtuples.datatypes
+package scalasql.simple.datatypes
 
 import scalasql.simple.{*, given}
 import scalasql.utils.ScalaSqlSuite
diff --git a/scalasql/simple/test/src/datatypes/SimpleTableOptionalTests.scala b/scalasql/simple/test/src/datatypes/SimpleTableOptionalTests.scala
@@ -1,4 +1,4 @@
-package scalasql.namedtuples.datatypes
+package scalasql.simple.datatypes
 
 import scalasql.simple.{*, given}
 import scalasql.utils.ScalaSqlSuite
diff --git a/scalasql/simple/test/src/example/SimpleTableH2Example.scala b/scalasql/simple/test/src/example/SimpleTableH2Example.scala
@@ -1,5 +1,5 @@
 // duplicated from scalasql/test/src/example/H2Example.scala
-package scalasql.namedtuples.example
+package scalasql.simple.example
 
 import scalasql.simple.{*, given}
 import H2Dialect.*
diff --git a/scalasql/simple/test/src/example/SimpleTableMySqlExample.scala b/scalasql/simple/test/src/example/SimpleTableMySqlExample.scala
@@ -1,5 +1,5 @@
 // duplicated from scalasql/test/src/example/MySqlExample.scala
-package scalasql.namedtuples.example
+package scalasql.simple.example
 
 import org.testcontainers.containers.MySQLContainer
 
diff --git a/scalasql/simple/test/src/example/SimpleTablePostgresExample.scala b/scalasql/simple/test/src/example/SimpleTablePostgresExample.scala
@@ -1,5 +1,5 @@
 // duplicated from scalasql/test/src/example/PostgresExample.scala
-package scalasql.namedtuples.example
+package scalasql.simple.example
 
 import org.testcontainers.containers.PostgreSQLContainer
 
diff --git a/scalasql/simple/test/src/example/SimpleTableSqliteExample.scala b/scalasql/simple/test/src/example/SimpleTableSqliteExample.scala
@@ -1,5 +1,5 @@
 // duplicated from scalasql/test/src/example/SqliteExample.scala
-package scalasql.namedtuples.example
+package scalasql.simple.example
 
 import scalasql.simple.{*, given}
 import SqliteDialect.*
diff --git a/scalasql/simple/test/src/example/WorldSqlTestsNamedTuple.scala b/scalasql/simple/test/src/example/WorldSqlTestsNamedTuple.scala
@@ -1,4 +1,4 @@
-package test.scalasql.namedtuples
+package test.scalasql.simple
 import utest._
 
 // adapted from scalasql/test/src/WorldSqlTests.scala to use named tuples
@@ -445,7 +445,7 @@ object WorldSqlTestsNamedTuple extends TestSuite {
         // each country, without all the other metadata:
         // +SNIPPET [MAP-1]
         // `NamedTupleQueryable` is also included by `import scalasql.simple.given`
-        import scalasql.namedtuples.NamedTupleQueryable.given
+        import scalasql.simple.NamedTupleQueryable.given
 
         val query = Country.select.map(c => (name = c.name, continent = c.continent))
         // -SNIPPET [MAP-1]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package scalasql.namedtuples`
	`1`	`+package scalasql.simple`
`2`	`2`
`3`	`3`	`import utest._`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package scalasql.namedtuples.datatypes`
	`1`	`+package scalasql.simple.datatypes`
`2`	`2`
`3`	`3`	`import scalasql.simple.{*, given}`
`4`	`4`