Merge branch 'master' into update/sbt-explicit-dependencies-0.3.1

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.10
+9bcedec20a4fc7adedce8aea4921c05b0c7acfa4

.github/workflows/ci.yml

@@ -1,8 +1,8 @@
 name: CI
 
 env:
-  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g
-  JVM_OPTS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g
+  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g -Xss4m
+  JVM_OPTS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g -Xss4m
 
 on:
   pull_request:
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['[email protected]', '[email protected]']
-        scala: ['2.12.17', '2.13.10']
+        scala: ['2.12.18', '2.13.10']
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.5.9"
+version = "3.7.11"
 maxColumn = 120
 align.preset = most
 continuationIndent.defnSite = 2

README.md

@@ -106,9 +106,12 @@ Values that will represent tables in DSL are then created by calling `defineTabl
 In order for `defineTable` to work, user need to provide implicit `Schema` of data type.
 
 ```scala
-import java.util.UUID
+import zio.schema.DeriveSchema
 import zio.sql.postgresql.PostgresJdbcModule
+import zio.sql.table.Table._
+
 import java.time._
+import java.util.UUID
 
 object Repository extends PostgresJdbcModule {
   final case class Product(id: UUID, name: String, price: BigDecimal)
@@ -140,43 +143,43 @@ Using the previous example with `Product` and `Order` table
 ```scala
 val (id, name, price) = products.columns
 
-val (orderId, productId, quantity) = orders.columns
+val (orderId, productId, quantity, date) = orders.columns
 ```
 
 ## Selects
 
 Simple select.
 
 ```scala
-val allProducts = select(productId, name, price).from(products)
+val allProducts = select(id, name, price).from(products)
 ```
 
 Using `where` clause.
 
 ```scala
-def productById(id: UUID) = 
-  select(productId, name, price).from(products).where(productId === id)
+def productById(uuid: UUID) = 
+  select(id, name, price).from(products).where(id === uuid)
 ```
 
 Inner join.
 
 ```scala
 val ordersWithProductNames = 
-  select(orderId, name).from(products.join(orders).on(productId === fkProductId))
+  select(orderId, name).from(products.join(orders).on(productId === id))
 ```
 
 Left outer join.
 
 ```scala
 val leftOuter = 
-  select(orderId, name).from(products.leftOuter(orders).on(productId === fkProductId))
+  select(orderId, name).from(products.leftOuter(orders).on(productId === id))
 ```
 
 Right outer join.
 
 ```scala
 val rightOuter = 
-  select(orderId, name).from(products.rightOuter(orders).on(productId === fkProductId))
+  select(orderId, name).from(products.rightOuter(orders).on(productId === id))
 ```
 
 Using `limit` and `offset`
@@ -185,26 +188,36 @@ Using `limit` and `offset`
 val limitedResults = 
   select(orderId, name)
     .from(products.join(orders)
-    .on(productId === fkProductId))
+    .on(productId === id))
     .limit(5)
     .offset(10)
 ```
 
 ## Inserts
 
 ```scala
-insertInto(products)
-    (productId, name, price)
-  .values((UUID.randomUUID(), "Zionomicon", 10.5))
+def insertProduct(uuid: UUID) =
+  insertInto(products)(id, name, price)
+    .values((uuid, "Zionomicon", 10.5))
 ```
 
 ## Updates
 
-TODO: details
+```scala
+def updateProduct(uuid: UUID) =
+  update(products)
+    .set(name, "foo")
+    .set(price, price * 1.1)
+    .where(id === uuid)
+```
 
 ## Deletes
 
-TODO: details
+```scala
+def deleteProduct(uuid: UUID) =
+    deleteFrom(products)
+      .where(id === uuid)
+```
 
 ## Transactions
 

build.sbt

@@ -23,11 +23,11 @@ addCommandAlias("fmtOnce", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("fmt", "fmtOnce;fmtOnce")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
 
-val zioVersion                 = "2.0.6"
-val zioSchemaVersion           = "0.4.2"
-val testcontainersVersion      = "1.17.6"
-val testcontainersScalaVersion = "0.40.11"
-val logbackVersion             = "1.2.11"
+val zioVersion                 = "2.0.15"
+val zioSchemaVersion           = "0.4.13"
+val testcontainersVersion      = "1.18.3"
+val testcontainersScalaVersion = "0.40.17"
+val logbackVersion             = "1.3.8"
 
 lazy val root = project
   .in(file("."))

docs/index.md

@@ -106,9 +106,12 @@ Values that will represent tables in DSL are then created by calling `defineTabl
 In order for `defineTable` to work, user need to provide implicit `Schema` of data type.
 
 ```scala
-import java.util.UUID
+import zio.schema.DeriveSchema
 import zio.sql.postgresql.PostgresJdbcModule
+import zio.sql.table.Table._
+
 import java.time._
+import java.util.UUID
 
 object Repository extends PostgresJdbcModule {
   final case class Product(id: UUID, name: String, price: BigDecimal)
@@ -140,43 +143,43 @@ Using the previous example with `Product` and `Order` table
 ```scala
 val (id, name, price) = products.columns
 
-val (orderId, productId, quantity) = orders.columns
+val (orderId, productId, quantity, date) = orders.columns
 ```
 
 ## Selects
 
 Simple select.
 
 ```scala
-val allProducts = select(productId, name, price).from(products)
+val allProducts = select(id, name, price).from(products)
 ```
 
 Using `where` clause.
 
 ```scala
-def productById(id: UUID) = 
-  select(productId, name, price).from(products).where(productId === id)
+def productById(uuid: UUID) = 
+  select(id, name, price).from(products).where(id === uuid)
 ```
 
 Inner join.
 
 ```scala
 val ordersWithProductNames = 
-  select(orderId, name).from(products.join(orders).on(productId === fkProductId))
+  select(orderId, name).from(products.join(orders).on(productId === id))
 ```
 
 Left outer join.
 
 ```scala
 val leftOuter = 
-  select(orderId, name).from(products.leftOuter(orders).on(productId === fkProductId))
+  select(orderId, name).from(products.leftOuter(orders).on(productId === id))
 ```
 
 Right outer join.
 
 ```scala
 val rightOuter = 
-  select(orderId, name).from(products.rightOuter(orders).on(productId === fkProductId))
+  select(orderId, name).from(products.rightOuter(orders).on(productId === id))
 ```
 
 Using `limit` and `offset`
@@ -185,26 +188,36 @@ Using `limit` and `offset`
 val limitedResults = 
   select(orderId, name)
     .from(products.join(orders)
-    .on(productId === fkProductId))
+    .on(productId === id))
     .limit(5)
     .offset(10)
 ```
 
 ## Inserts
 
 ```scala
-insertInto(products)
-    (productId, name, price)
-  .values((UUID.randomUUID(), "Zionomicon", 10.5))
+def insertProduct(uuid: UUID) =
+  insertInto(products)(id, name, price)
+    .values((uuid, "Zionomicon", 10.5))
 ```
 
 ## Updates
 
-TODO: details
+```scala
+def updateProduct(uuid: UUID) =
+  update(products)
+    .set(name, "foo")
+    .set(price, price * 1.1)
+    .where(id === uuid)
+```
 
 ## Deletes
 
-TODO: details
+```scala
+def deleteProduct(uuid: UUID) =
+    deleteFrom(products)
+      .where(id === uuid)
+```
 
 ## Transactions
 

jdbc/src/main/scala/zio/sql/JdbcInternalModule.scala

@@ -27,6 +27,7 @@ trait JdbcInternalModule { self: Jdbc =>
         else
           try {
             val value = decoder
+            if (resultSet.wasNull()) return Right(null.asInstanceOf[A])
 
             value match {
               case Some(value) => Right(value)

macros/src/main/scala-2/zio/sql/macros/insertlike.scala

@@ -26,7 +26,7 @@ object InsertLike {
     F,
     ColsRepr,
     AllColumnIdentities,
-    Z,
+    Z
   ] = macro createInsertLikeImpl[F, ColsRepr, AllColumnIdentities, Z]
 
   def createInsertLikeImpl[

macros/src/main/scala-3/zio/sql/macros/groupbylike.scala

@@ -1,11 +1,10 @@
 package zio.sql.macros
 
-
 sealed trait GroupByLike[All, Grouped]
 
 object GroupByLike {
 
-    final case class CanBeGrouped[All, Grouped]() extends GroupByLike[All, Grouped]
+  final case class CanBeGrouped[All, Grouped]() extends GroupByLike[All, Grouped]
 
-    implicit def createGroupByLike[All, Grouped]: GroupByLike[All, Grouped] = CanBeGrouped[All, Grouped]()
-}
+  implicit def createGroupByLike[All, Grouped]: GroupByLike[All, Grouped] = CanBeGrouped[All, Grouped]()
+}

macros/src/main/scala-3/zio/sql/macros/havinglike.scala

@@ -1,11 +1,12 @@
-package zio.sql.macros 
+package zio.sql.macros
 
 sealed trait HavingIsSound[AllF, GroupByF, HavingF]
 
 object HavingIsSound {
 
   final case class HavingCanBeCalled[AllF, GroupByF, HavingF]() extends HavingIsSound[AllF, GroupByF, HavingF]
 
-  implicit def materializeHavingIsSound[AllF, GroupByF, HavingF]: HavingIsSound[AllF, GroupByF, HavingF] = HavingCanBeCalled[AllF, GroupByF, HavingF]()
+  implicit def materializeHavingIsSound[AllF, GroupByF, HavingF]: HavingIsSound[AllF, GroupByF, HavingF] =
+    HavingCanBeCalled[AllF, GroupByF, HavingF]()
 
-}
+}

macros/src/main/scala-3/zio/sql/macros/insertlike.scala

@@ -16,6 +16,6 @@ object InsertLike {
     F,
     ColsRepr,
     AllColumnIdentities,
-    Z,
+    Z
   ] = CanBeInserted[F, ColsRepr, AllColumnIdentities, Z]()
 }

macros/src/main/scala-3/zio/sql/macros/normalizer.scala

@@ -13,8 +13,7 @@ object Normalizer {
 //     override type Out = Out2
 //   }
 
-  implicit def createNormalizer[In]: Normalizer[In] = {
+  implicit def createNormalizer[In]: Normalizer[In] =
     new Normalizer[In] {}
-  }
 
 }

macros/src/main/scala-3/zio/sql/macros/notliteral.scala

@@ -1,12 +1,11 @@
-package zio.sql.macros 
+package zio.sql.macros
 
 sealed trait IsNotLiteral[F]
 
 object IsNotLiteral {
 
-    final case class FIsNotLiteral[F]() extends IsNotLiteral[F]
+  final case class FIsNotLiteral[F]() extends IsNotLiteral[F]
 
-    implicit def materializeIsNotLiteral[F]: IsNotLiteral[F] = {
-        FIsNotLiteral[F]()
-    }
-}
+  implicit def materializeIsNotLiteral[F]: IsNotLiteral[F] =
+    FIsNotLiteral[F]()
+}

macros/src/main/scala-3/zio/sql/macros/tablelike.scala

@@ -6,7 +6,6 @@ object TableSchema {
 
   final case class Compatible[T]() extends TableSchema[T]
 
-
   implicit def materializeTableSchema[T]: TableSchema[T] = Compatible[T]()
 
-}
+}