Merge branch 'master' into 639_hikaricp

pablo-zebraitis · Aug 11, 2022 · e07707f · e07707f
2 parents a68eb3c + 421c226
commit e07707f
Show file tree

Hide file tree

Showing 22 changed files with 1,993 additions and 418 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,9 @@
 name: CI
 
+env:
+  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g
+  JVM_OPTS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g
+
 on:
   pull_request:
   push:
@@ -31,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['[email protected]', '[email protected]']
-        scala: ['2.12.15', '2.13.8']
+        scala: ['2.12.16', '2.13.8']
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.5.3"
+version = "3.5.8"
 maxColumn = 120
 align.preset = most
 continuationIndent.defnSite = 2

diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ Feature | PostgreSQL | SQL Server | Oracle             | MySQL
 :------------ | :-------------| :-------------|:-------------------| :-------------
 Render Read   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 Render Delete | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | 
-Render Update | :heavy_check_mark: |                    | :heavy_check_mark: | :heavy_check_mark: |
-Render Insert | :heavy_check_mark: |                    | :heavy_check_mark: | :heavy_check_mark: |
+Render Update | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+Render Insert | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 Functions     | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 Types         | :white_check_mark: |                    |                    | :white_check_mark: |
 Operators     |                    |                    |                    |                    |

diff --git a/build.sbt b/build.sbt
@@ -25,8 +25,8 @@ addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck"
 
 val zioVersion                 = "2.0.0"
 val zioSchemaVersion           = "0.2.0"
-val testcontainersVersion      = "1.17.2"
-val testcontainersScalaVersion = "0.40.8"
+val testcontainersVersion      = "1.17.3"
+val testcontainersScalaVersion = "0.40.10"
 val logbackVersion             = "1.2.11"
 
 lazy val root = project
@@ -118,7 +118,7 @@ lazy val jdbc = project
     libraryDependencies ++= Seq(
       "dev.zio"       %% "zio-test"                        % zioVersion                 % Test,
       "dev.zio"       %% "zio-test-sbt"                    % zioVersion                 % Test,
-      "org.postgresql" % "postgresql"                      % "42.3.6"                   % Test,
+      "org.postgresql" % "postgresql"                      % "42.4.1"                   % Test,
       "com.dimafeng"  %% "testcontainers-scala-postgresql" % testcontainersScalaVersion % Test
     )
   )
@@ -161,7 +161,7 @@ lazy val mysql = project
       "org.testcontainers" % "database-commons"           % testcontainersVersion      % Test,
       "org.testcontainers" % "jdbc"                       % testcontainersVersion      % Test,
       "org.testcontainers" % "mysql"                      % testcontainersVersion      % Test,
-      "mysql"              % "mysql-connector-java"       % "8.0.29"                   % Test,
+      "mysql"              % "mysql-connector-java"       % "8.0.30"                   % Test,
       "com.dimafeng"      %% "testcontainers-scala-mysql" % testcontainersScalaVersion % Test,
       "ch.qos.logback"     % "logback-classic"            % logbackVersion             % Test
     )
@@ -180,7 +180,7 @@ lazy val oracle = project
       "org.testcontainers"       % "database-commons"               % testcontainersVersion      % Test,
       "org.testcontainers"       % "oracle-xe"                      % testcontainersVersion      % Test,
       "org.testcontainers"       % "jdbc"                           % testcontainersVersion      % Test,
-      "com.oracle.database.jdbc" % "ojdbc8"                         % "21.5.0.0"                 % Test,
+      "com.oracle.database.jdbc" % "ojdbc8"                         % "21.6.0.0.1"               % Test,
       "com.dimafeng"            %% "testcontainers-scala-oracle-xe" % testcontainersScalaVersion % Test,
       "ch.qos.logback"           % "logback-classic"                % logbackVersion             % Test
     )
@@ -199,7 +199,7 @@ lazy val postgres = project
       "org.testcontainers" % "database-commons"                % testcontainersVersion      % Test,
       "org.testcontainers" % "postgresql"                      % testcontainersVersion      % Test,
       "org.testcontainers" % "jdbc"                            % testcontainersVersion      % Test,
-      "org.postgresql"     % "postgresql"                      % "42.3.6"                   % Compile,
+      "org.postgresql"     % "postgresql"                      % "42.4.1"                   % Compile,
       "com.dimafeng"      %% "testcontainers-scala-postgresql" % testcontainersScalaVersion % Test,
       "ch.qos.logback"     % "logback-classic"                 % logbackVersion             % Test
     )

diff --git a/core/jvm/src/main/scala/zio/sql/expr.scala b/core/jvm/src/main/scala/zio/sql/expr.scala
@@ -412,7 +412,6 @@ trait ExprModule extends NewtypesModule with FeaturesModule with OpsModule {
     val Ascii       = FunctionDef[String, Int](FunctionName("ascii"))
     val CharLength  = FunctionDef[String, Int](FunctionName("character_length"))
     val Concat      = FunctionDef[(String, String), String](FunctionName("concat")) // todo varargs
-    val ConcatWs2   = FunctionDef[(String, String), String](FunctionName("concat_ws"))
     val ConcatWs3   = FunctionDef[(String, String, String), String](FunctionName("concat_ws"))
     val ConcatWs4   = FunctionDef[(String, String, String, String), String](FunctionName("concat_ws"))
     val Lower       = FunctionDef[String, String](FunctionName("lower"))

diff --git a/mysql/project/build.properties b/mysql/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1