Cosmetics

sake92 · Jan 9, 2024 · 222960d · 222960d
1 parent aa101f7
commit 222960d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 30 deletions.
diff --git a/DEV.md b/DEV.md
@@ -13,7 +13,7 @@
 ./mill examples.runMain bla
 
 # for local dev/test
-./mill  squery.publishM2Local
+./mill  squery.publishLocal
 
 git diff
 git commit -am "msg"
@@ -36,3 +36,5 @@ git push  --atomic origin main $VERSION
 - neo4j
 - cassandra
 - sql parser reorders OFFSET LIMIT ???
+- generate (id, name) + corresponding insert (?, ?)
+    depending on autoincrement/serial stuff
diff --git a/docs/src/files/tutorials/GettingStarted.scala b/docs/src/files/tutorials/GettingStarted.scala
@@ -21,10 +21,11 @@ object GettingStarted extends TutorialPage {
       ```scala
       import ba.sake.squery.{*, given}
       // import one of these if needed:
-      // import ba.sake.squery.postgres.*
-      // import ba.sake.squery.mysql.*
-      // import ba.sake.squery.mariadb.*
-      // import ba.sake.squery.oracle.*
+      // import ba.sake.squery.postgres.{*, given}
+      // import ba.sake.squery.mysql.{*, given}
+      // import ba.sake.squery.mariadb.{*, given}
+      // import ba.sake.squery.oracle.{*, given}
+      // import ba.sake.squery.h2.{*, given}
       
       val ds = com.zaxxer.hikari.HikariDataSource()
       ds.setJdbcUrl(..)

diff --git a/squery/src/ba/sake/squery/query.scala b/squery/src/ba/sake/squery/query.scala
@@ -29,8 +29,6 @@ case class Query(
       colNames: Seq[String] = Seq.empty
   ): jsql.PreparedStatement = {
     val enrichedQueryString = Query.enrichSqlQuery(sqlString)
-    // TODO reorder enriched issue..
-    // println("enriched: " + enrichedQueryString)
     logger.debug(s"Executing statement: $enrichedQueryString")
     val stat =
       if retGenKeys then

diff --git a/squery/src/ba/sake/squery/sql.scala b/squery/src/ba/sake/squery/sql.scala
@@ -6,10 +6,6 @@ import scala.collection.mutable.ListBuffer
 import ba.sake.squery.write.*
 import ba.sake.squery.Query
 
-// TODO make derived SqlArgument[CaseClass]
-// and insert (?, ?) automatically ??
-// or autogenerate it with scalafix, easier
-
 case class LiteralString(value: String)
 
 case class DynamicArg[T](value: T)(using val sqlWrite: SqlWrite[T])

diff --git a/squery/src/ba/sake/squery/squery.scala b/squery/src/ba/sake/squery/squery.scala
@@ -80,7 +80,6 @@ extension (query: Query) {
       throw SqueryException("No value returned from query")
     )
 
-  // TODO same for UPDATE RETURNING.. ?
   def insertReturningRows[A]()(using
       c: SqueryConnection,
       r: SqlReadRow[A]

diff --git a/squery/test/src/ba/sake/squery/oracle/OracleSuite.scala b/squery/test/src/ba/sake/squery/oracle/OracleSuite.scala
@@ -240,21 +240,6 @@ class OracleSuite extends munit.FunSuite {
     }
   }
 
-  // TODO seems like this only works with PL/SQL ...
-  /*
-  test("INSERT returning columns") {
-    val ctx = initDb()
-    ctx.run {
-      val customer = sql"""
-        INSERT INTO customers(name)
-        VALUES ('bla')
-        RETURNING id, name, street
-        INTO id, name, street
-      """.insertReturningRow[Customer]()
-      assertEquals(customer.name, "bla")
-    }
-  }
-   */
   test("UPDATE should return number of affected rows") {
     val ctx = initDb()
     ctx.run {

diff --git a/squery/test/src/ba/sake/squery/postgres/PostgresSuite.scala b/squery/test/src/ba/sake/squery/postgres/PostgresSuite.scala
@@ -359,15 +359,14 @@ class PostgresSuite extends munit.FunSuite {
     ctx.run {
       // custom squery warnings
       // no WHERE clause
-      // TODO how to test these..?
+      // TODO how to test logging statements ??
       sql"UPDATE customers SET name='bla'".update()
 
       intercept[Exception] {
         sql"DELETE FROM customers".update()
       }
 
-      // JDBC warning
-      // TODO not triggering...
+      // TODO not triggering JDBC warning...
       sql"""
         CREATE OR REPLACE FUNCTION test_fun_warn() RETURNS integer AS $$$$
         BEGIN