Merge branch 'master' into scala-3.0.0

Author: jczuchnowski

examples/src/main/scala/Example1.scala

@@ -3,7 +3,8 @@ import zio.sql.Sql
 object Example1 extends Sql {
   import ColumnSet._
 
-  def renderRead(read: this.Read[_]): String       = ???
+  def renderRead(read: this.Read[_]): String = ???
+
   def renderDelete(delete: this.Delete[_]): String = ???
 
   def renderUpdate(update: Example1.Update[_]): String = ???
@@ -22,22 +23,20 @@ object Example1 extends Sql {
   import AggregationDef._
 
   val queried =
-    (select {
-      ((age + 2) as "age") ++ (name as "name") ++ (Abs(3.0) as "dummy")
-    } from table)
+    select(((age + 2) as "age") ++ (name as "name") ++ (Abs(3.0) as "dummy"))
+      .from(table)
       .limit(200)
       .offset(1000)
       .orderBy(age.descending)
 
   val joined =
-    select {
-      (age as "age") ++ (age2 as "age2")
-    } from (table join table2).on(name === name2)
+    select((age as "age") ++ (age2 as "age2"))
+      .from(table.join(table2).on(name === name2))
 
   val aggregated =
-    (select {
-      (Arbitrary(age) as "age") ++ (Count(1) as "count")
-    } from table) groupBy age
+    select((Arbitrary(age) as "age") ++ (Count(1) as "count"))
+      .from(table)
+      .groupBy(age)
 
   val deleted = deleteFrom(table).where(age === 3)
 

examples/src/main/scala/zio/sql/Examples.scala

@@ -10,18 +10,19 @@ object Examples extends App with ShopSchema with SqlServerModule {
   import this.Users._
 
   //select first_name, last_name from users
-  val basicSelect = select(fName ++ lName) from users
+  val basicSelect =
+    select(fName ++ lName).from(users)
   println(renderRead(basicSelect))
 
   //select first_name as first, last_name as last from users
-  val basicSelectWithAliases = select {
-    (fName as "first") ++ (lName as "last")
-  } from users
+  val basicSelectWithAliases =
+    select((fName as "first") ++ (lName as "last")).from(users)
   println(renderRead(basicSelectWithAliases))
 
   //select top 2 first_name, last_name from users order by last_name, first_name desc
   val selectWithRefinements =
-    (select(fName ++ lName) from users)
+    select(fName ++ lName)
+      .from(users)
       .orderBy(lName, fName.desc)
       .limit(2)
   println(renderRead(selectWithRefinements))
@@ -32,7 +33,8 @@ object Examples extends App with ShopSchema with SqlServerModule {
   // execute(selectWithRefinements).to((_, _))
 
   //delete from users where first_name = 'Terrence'
-  val basicDelete = deleteFrom(users).where(fName === "Terrence")
+  val basicDelete =
+    deleteFrom(users).where(fName === "Terrence")
   println(renderDelete(basicDelete))
 
   /*
@@ -41,9 +43,8 @@ object Examples extends App with ShopSchema with SqlServerModule {
     }) */
 
   //select first_name, last_name, order_date from users left join orders on users.usr_id = orders.usr_id
-  val basicJoin = select {
-    fName ++ lName ++ orderDate
-  } from (users leftOuter orders).on(fkUserId === userId)
+  val basicJoin =
+    select(fName ++ lName ++ orderDate).from(users.leftOuter(orders).on(fkUserId === userId))
   println(renderRead(basicJoin))
   /*
     select users.usr_id, first_name, last_name, sum(quantity * unit_price) as "total_spend"
@@ -53,20 +54,20 @@ object Examples extends App with ShopSchema with SqlServerModule {
     group by users.usr_id, first_name, last_name */
 
   val orderValues =
-    (select {
+    select(
       (Arbitrary(userId)) ++
         (Arbitrary(fName)) ++
         (Arbitrary(lName)) ++
         (Sum(quantity * unitPrice) as "total_spend") ++
         Sum(Abs(quantity))
-    }
-      from {
+    )
+      .from(
         users
           .join(orders)
           .on(userId === fkUserId)
           .leftOuter(orderDetails)
           .on(orderId === fkOrderId)
-      })
+      )
       .groupBy(userId, fName /*, lName */ ) //shouldn't compile without lName todo fix #38
   println(renderRead(orderValues))
 
@@ -75,6 +76,6 @@ object Examples extends App with ShopSchema with SqlServerModule {
   /*
    * select users.first_name, users.last_name from users where true and users.first_name is not null
    */
-  val withPropertyOp = select(fName ++ lName) from users where (fName isNotNull)
+  val withPropertyOp = select(fName ++ lName).from(users).where(fName isNotNull)
   println(renderRead(withPropertyOp))
 }

project/plugins.sbt

@@ -3,7 +3,7 @@ addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"  %
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"              % "2.4.2")
 addSbtPlugin("pl.project13.scala"                % "sbt-jmh"                   % "0.4.0")
 addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"             % "0.10.0")
-addSbtPlugin("org.scoverage"                     % "sbt-scoverage"             % "1.7.2")
+addSbtPlugin("org.scoverage"                     % "sbt-scoverage"             % "1.7.3")
 addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                  % "2.2.20")
 addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                 % "1.4.8")
 addSbtPlugin("com.eed3si9n"                      % "sbt-unidoc"                % "0.4.3")