diff --git a/README.md b/README.md index 24437ffab..c15129ba1 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Running Reads | :heavy_check_mark: Running Deletes | :heavy_check_mark: Running Updates | :heavy_check_mark: Running Inserts | -Transactions | +Transactions | :white_check_mark: Connection pool | #### Db-specific features: diff --git a/examples/src/main/scala/Example1.scala b/examples/src/main/scala/Example1.scala index f2c2b8427..2a1ed6b42 100644 --- a/examples/src/main/scala/Example1.scala +++ b/examples/src/main/scala/Example1.scala @@ -39,7 +39,7 @@ object Example1 extends Sql { (Arbitrary(age) as "age") ++ (Count(1) as "count") } from table) groupBy age - //val deleted = deleteFrom(table).where(age === 3) + val deleted = deleteFrom(table).where(age === 3) val updated = update(table) diff --git a/examples/src/main/scala/zio/sql/Examples.scala b/examples/src/main/scala/zio/sql/Examples.scala index a52b9de85..dec1f3b52 100644 --- a/examples/src/main/scala/zio/sql/Examples.scala +++ b/examples/src/main/scala/zio/sql/Examples.scala @@ -33,7 +33,7 @@ object Examples extends App with ShopSchema with SqlServerModule { //delete from users where first_name = 'Terrence' val basicDelete = deleteFrom(users).where(fName === "Terrence") - //println(renderDelete(basicDelete)) + println(renderDelete(basicDelete)) /* val deleteFromWithSubquery = deleteFrom(orders).where(fkUserId in { diff --git a/postgres/src/test/scala/zio/sql/postgresql/DeleteSpec.scala b/postgres/src/test/scala/zio/sql/postgresql/DeleteSpec.scala new file mode 100644 index 000000000..c5dd8e3c2 --- /dev/null +++ b/postgres/src/test/scala/zio/sql/postgresql/DeleteSpec.scala @@ -0,0 +1,27 @@ +package zio.sql.postgresql + +import zio.Cause +import zio.test.Assertion._ +import zio.test._ + +import scala.language.postfixOps + +object DeleteSpec extends PostgresRunnableSpec with ShopSchema { + + import Customers._ + + override def specLayered = suite("Postgres module delete")( + testM("Can delete from single table with a condition") { + val query = deleteFrom(customers) where (verified isNotTrue) + println(renderDelete(query)) + + val result = execute(query) + + val assertion = for { + r <- result + } yield assert(r)(equalTo(1)) + + assertion.mapErrorCause(cause => Cause.stackless(cause.untraced)) + } + ) +} diff --git a/postgres/src/test/scala/zio/sql/postgresql/PostgresModuleTest.scala b/postgres/src/test/scala/zio/sql/postgresql/PostgresModuleSpec.scala similarity index 92% rename from postgres/src/test/scala/zio/sql/postgresql/PostgresModuleTest.scala rename to postgres/src/test/scala/zio/sql/postgresql/PostgresModuleSpec.scala index 2048d659c..dc8651ab0 100644 --- a/postgres/src/test/scala/zio/sql/postgresql/PostgresModuleTest.scala +++ b/postgres/src/test/scala/zio/sql/postgresql/PostgresModuleSpec.scala @@ -9,7 +9,7 @@ import zio.test._ import scala.language.postfixOps -object PostgresModuleTest extends PostgresRunnableSpec with ShopSchema { +object PostgresModuleSpec extends PostgresRunnableSpec with ShopSchema { import Customers._ import Orders._ @@ -291,29 +291,5 @@ object PostgresModuleTest extends PostgresRunnableSpec with ShopSchema { assertM(result.flip)(equalTo("failing")).mapErrorCause(cause => Cause.stackless(cause.untraced)) } - // testM("Can delete all from a single table") { TODO: Does not work on 2.12 yet - // val query = deleteFrom(customers) - // println(renderDelete(query)) - - // val result = execute(query) - - // val assertion = for { - // r <- result - // } yield assert(r)(equalTo(5)) - - // assertion.mapErrorCause(cause => Cause.stackless(cause.untraced)) - // }, - // testM("Can delete from single table with a condition") { - // val query = deleteFrom(customers) where (verified isNotTrue) - // println(renderDelete(query)) - - // val result = execute(query) - - // val assertion = for { - // r <- result - // } yield assert(r)(equalTo(1)) - - // assertion.mapErrorCause(cause => Cause.stackless(cause.untraced)) - // } ) } diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 6e5b2030e..edf996122 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -183,7 +183,7 @@ object BuildHelper { name := s"$prjName", scalacOptions := stdOptions, crossScalaVersions := Seq(Scala213, Scala212, Scala211), - scalaVersion in ThisBuild := Scala212, + scalaVersion in ThisBuild := crossScalaVersions.value.head, scalacOptions := stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value), libraryDependencies ++= { if (isDotty.value)