Separate specifics for Postgres, MySql, MariaDb

build.sc

@@ -18,9 +18,15 @@ object squery extends CommonScalaModule with SqueryPublishModule {
       ivy"ch.qos.logback:logback-classic:1.4.6",
       ivy"org.scalameta::munit:1.0.0-M7",
       ivy"com.zaxxer:HikariCP:4.0.3",
-      ivy"org.postgresql:postgresql:42.5.4",
       ivy"org.testcontainers:testcontainers:1.17.6",
-      ivy"org.testcontainers:postgresql:1.17.6"
+      ivy"org.testcontainers:postgresql:1.17.6",
+      ivy"org.postgresql:postgresql:42.5.4",
+      ivy"org.testcontainers:mysql:1.19.3",
+      ivy"mysql:mysql-connector-java:8.0.33",
+      ivy"org.testcontainers:mariadb:1.19.3",
+      ivy"org.mariadb.jdbc:mariadb-java-client:3.3.2"
+
+
     )
   }
 }

docs/src/files/howtos/HowToPage.scala

@@ -22,7 +22,7 @@ trait HowToPage extends DocPage {
     InterpolateValues,
     InterpolateQueries,
     DynamicQueries,
-    Transactions,
+    Transactions
   )
 
   override def pageCategory = Some("How-Tos")

squery/src/ba/sake/squery/mariadb/reads.scala

@@ -0,0 +1,13 @@
+package ba.sake.squery.mariadb
+
+import java.{sql => jsql}
+import java.util.UUID
+import ba.sake.squery.read.*
+
+given SqlRead[UUID] with {
+  def readByName(jRes: jsql.ResultSet, colName: String): Option[UUID] =
+    Option(jRes.getString(colName)).map(UUID.fromString)
+
+  def readByIdx(jRes: jsql.ResultSet, colIdx: Int): Option[UUID] =
+    Option(jRes.getString(colIdx)).map(UUID.fromString)
+}

squery/src/ba/sake/squery/mariadb/writes.scala

@@ -0,0 +1,15 @@
+package ba.sake.squery.mariadb
+
+import java.{sql => jsql}
+import java.util.UUID
+import ba.sake.squery.write.*
+
+given SqlWrite[UUID] with {
+  def write(
+      ps: jsql.PreparedStatement,
+      idx: Int,
+      valueOpt: Option[UUID]
+  ): Unit = valueOpt match
+    case Some(value) => ps.setString(idx, value.toString)
+    case None        => ps.setString(idx, null)
+}

squery/src/ba/sake/squery/mysql/reads.scala

@@ -0,0 +1,13 @@
+package ba.sake.squery.mysql
+
+import java.{sql => jsql}
+import java.util.UUID
+import ba.sake.squery.read.*
+
+given SqlRead[UUID] with {
+  def readByName(jRes: jsql.ResultSet, colName: String): Option[UUID] =
+    Option(jRes.getString(colName)).map(UUID.fromString)
+
+  def readByIdx(jRes: jsql.ResultSet, colIdx: Int): Option[UUID] =
+    Option(jRes.getString(colIdx)).map(UUID.fromString)
+}

squery/src/ba/sake/squery/mysql/writes.scala

@@ -0,0 +1,15 @@
+package ba.sake.squery.mysql
+
+import java.{sql => jsql}
+import java.util.UUID
+import ba.sake.squery.write.*
+
+given SqlWrite[UUID] with {
+  def write(
+      ps: jsql.PreparedStatement,
+      idx: Int,
+      valueOpt: Option[UUID]
+  ): Unit = valueOpt match
+    case Some(value) => ps.setString(idx, value.toString)
+    case None        => ps.setString(idx, null)
+}

squery/src/ba/sake/squery/postgres/reads.scala

@@ -0,0 +1,13 @@
+package ba.sake.squery.postgres
+
+import java.{sql => jsql}
+import java.util.UUID
+import ba.sake.squery.read.*
+
+given SqlRead[UUID] with {
+  def readByName(jRes: jsql.ResultSet, colName: String): Option[UUID] =
+    Option(jRes.getObject(colName, classOf[UUID]))
+
+  def readByIdx(jRes: jsql.ResultSet, colIdx: Int): Option[UUID] =
+    Option(jRes.getObject(colIdx, classOf[UUID]))
+}

squery/src/ba/sake/squery/postgres/writes.scala

@@ -0,0 +1,15 @@
+package ba.sake.squery.postgres
+
+import java.{sql => jsql}
+import java.util.UUID
+import ba.sake.squery.write.*
+
+given SqlWrite[UUID] with {
+  def write(
+      ps: jsql.PreparedStatement,
+      idx: Int,
+      valueOpt: Option[UUID]
+  ): Unit = valueOpt match
+    case Some(value) => ps.setObject(idx, value)
+    case None        => ps.setNull(idx, jsql.Types.OTHER)
+}

squery/src/ba/sake/squery/read/SqlRead.scala

@@ -82,14 +82,6 @@ object SqlRead {
       Option(jRes.getTimestamp(colIdx)).map(_.toLocalDateTime())
   }
 
-  given SqlRead[UUID] with {
-    def readByName(jRes: jsql.ResultSet, colName: String): Option[UUID] =
-      Option(jRes.getObject(colName, classOf[UUID]))
-
-    def readByIdx(jRes: jsql.ResultSet, colIdx: Int): Option[UUID] =
-      Option(jRes.getObject(colIdx, classOf[UUID]))
-  }
-
   // this "cannot fail"
   given [T](using sr: SqlRead[T]): SqlRead[Option[T]] with {
     def readByName(jRes: jsql.ResultSet, colName: String): Option[Option[T]] =

squery/src/ba/sake/squery/write/SqlWrite.scala

@@ -118,16 +118,6 @@ object SqlWrite {
       case None => ps.setNull(idx, jsql.Types.TIMESTAMP)
   }
 
-  given SqlWrite[UUID] with {
-    def write(
-        ps: jsql.PreparedStatement,
-        idx: Int,
-        valueOpt: Option[UUID]
-    ): Unit = valueOpt match
-      case Some(value) => ps.setObject(idx, value)
-      case None        => ps.setNull(idx, jsql.Types.OTHER)
-  }
-
   given [T](using sw: SqlWrite[T]): SqlWrite[Option[T]] with {
     def write(
         ps: jsql.PreparedStatement,
@@ -175,8 +165,8 @@ object SqlWrite {
                 case Some(value) =>
                   val index = $m.ordinal(value)
                   val label = $labels(index)
-                  ps.setObject(idx, label, jsql.Types.OTHER)
-                case None => ps.setNull(idx, jsql.Types.OTHER)
+                  ps.setString(idx, label)
+                case None => ps.setString(idx, null)
           }
         }
 

squery/test/src/ba/sake/squery/dataTypes.scala

@@ -16,16 +16,4 @@ case class CustomerWithPhoneOpt(c: Customer, p: Option[Phone]) derives SqlReadRo
 case class Address(id: Int, name: Option[String]) derives SqlReadRow
 case class CustomerWithAddressOpt(c: Customer, a: Option[Address]) derives SqlReadRow
 
-case class Datatypes(
-    int: Option[Int],
-    long: Option[Long],
-    double: Option[Double],
-    boolean: Option[Boolean],
-    string: Option[String],
-    uuid: Option[UUID],
-    tstz: Option[Instant],
-    clr: Option[Color]
-) derives SqlReadRow
 
-enum Color derives SqlRead, SqlWrite:
-  case red, green, blue