Merge branch 'master' into update/zio-2.0.21

zio · Mar 10, 2024 · 11e7064 · 11e7064
2 parents 1cf7eb7 + cde309c
commit 11e7064
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -219,7 +219,7 @@ lazy val `quill-core` =
     .settings(
       libraryDependencies ++= Seq(
         "com.typesafe"                % "config"        % "1.4.3",
-        "dev.zio"                    %% "zio-logging"   % "2.1.16",
+        "dev.zio"                    %% "zio-logging"   % "2.1.17",
         "dev.zio"                    %% "zio"           % Version.zio,
         "dev.zio"                    %% "zio-streams"   % Version.zio,
         "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
@@ -561,7 +561,7 @@ lazy val `quill-orientdb` =
     .settings(
       Test / fork := true,
       libraryDependencies ++= Seq(
-        "com.orientechnologies" % "orientdb-graphdb" % "3.2.24"
+        "com.orientechnologies" % "orientdb-graphdb" % "3.2.26"
       )
     )
     .dependsOn(
@@ -583,10 +583,10 @@ lazy val `quill-test-kit` =
 lazy val jdbcTestingLibraries = Seq(
   libraryDependencies ++= Seq(
     "com.zaxxer"              % "HikariCP"                % "5.1.0" exclude ("org.slf4j", "*"),
-    "com.mysql"               % "mysql-connector-j"       % "8.2.0"       % Test,
+    "com.mysql"               % "mysql-connector-j"       % "8.3.0"       % Test,
     "com.h2database"          % "h2"                      % "2.2.224"     % Test,
     "org.postgresql"          % "postgresql"              % "42.7.0"      % Test,
-    "org.xerial"              % "sqlite-jdbc"             % "3.42.0.1"    % Test,
+    "org.xerial"              % "sqlite-jdbc"             % "3.45.0.0"    % Test,
     "com.microsoft.sqlserver" % "mssql-jdbc"              % "7.4.1.jre11" % Test,
     "com.oracle.ojdbc"        % "ojdbc8"                  % "19.3.0.0"    % Test,
     "org.mockito"            %% "mockito-scala-scalatest" % "1.17.14"     % Test

diff --git a/quill-engine/src/main/scala/io/getquill/norm/BetaReduction.scala b/quill-engine/src/main/scala/io/getquill/norm/BetaReduction.scala
@@ -92,7 +92,7 @@ case class BetaReduction(map: IMap[Ast, Ast], typeBehavior: TypeBehavior, emptyB
         // Prepending IMap[Ast, Ast]() is needed otherwise 2.13 fails complaining:
         // Note: io.getquill.ast.Ident <: io.getquill.ast.Ast, but trait Map is invariant in type K.
         val bodyr =
-          new BetaReduction(IMap[Ast, Ast]() ++ conflicts ++ params.zip(newParams), typeBehavior, emptyBehavior)
+          new BetaReduction(IMap[Ast, Ast]() ++ conflicts, typeBehavior, emptyBehavior)
             .apply(body)
         apply(BetaReduction(map ++ newParams.zip(values).toMap, typeBehavior, emptyBehavior).apply(bodyr))