Merge branch 'master' into scala_3_support

build.sbt

@@ -67,12 +67,12 @@ def mainDependencies(scalaVersion: String) = {
     "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0",
     "dev.zio" %% "izumi-reflect" % "2.3.8",
     "com.typesafe.slick" %% "slick" % "3.5.0-M5",
-    "org.postgresql" % "postgresql" % "42.6.0",
+    "org.postgresql" % "postgresql" % "42.7.1",
     "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
     "org.slf4j" % "slf4j-simple" % "2.0.9" % "provided",
     "org.scalatest" %% "scalatest" % "3.2.17" % "test",
-    "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.17" % "test",
-    "com.dimafeng" %% "testcontainers-scala-postgresql" % "0.40.17" % "test"
+    "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.0" % "test",
+    "com.dimafeng" %% "testcontainers-scala-postgresql" % "0.41.0" % "test"
   ) ++ (if (scalaVersion.startsWith("3")) Nil else Seq("org.scala-lang" % "scala-reflect" % scalaVersion))
 }
 
@@ -191,7 +191,7 @@ lazy val slickPgArgonaut = (project in file("./addons/argonaut"))
     name := "slick-pg_argonaut",
     description := "Slick extensions for PostgreSQL - argonaut module",
     libraryDependencies := mainDependencies(scalaVersion.value) ++
-      Seq("io.argonaut" %% "argonaut" % "6.3.8")
+      Seq("io.argonaut" %% "argonaut" % "6.3.9")
   )
   .dependsOn (slickPgCore % "test->test;compile->compile")
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.7

src/test/scala/com/github/tminglei/slickpg/PgCompositeSupportSuite.scala

@@ -199,7 +199,17 @@ class PgCompositeSupportSuite extends AnyFunSuite with PostgresContainer {
   val rec31 = TestBean3(1, None)
   val rec32 = TestBean3(2, Some(Composite4(1, "x1", Nil, Some(List.empty), "get(\"x1\").ok", "(4).ok")))
   val rec32_al = TestBean3(2, Some(Composite4(1, "x1", Nil, None, "get(\"x1\").ok", "(4).ok")))
-  val rec33 = TestBean3(3, Some(Composite4(2, "x2", List("xxx(yyy)zz,z", "u(vv)(w)x(y)", "x=1&y=2&[INSERT_DEVICE_ID_HERE]&z=3"), Some(List("\"t")), "(get(\"A\") + get(\"A\")).ok", "call(A, B).ok")))
+  val rec33 = TestBean3(3, Some(Composite4(2, "x2", List("xxx(yyy)zz,z", "u(vv)(w)x(y)", "x=1&y=2&[INSERT_DEVICE_ID_HERE]&z=3",
+    ")read_world_example", // parses a null element into list `" null, ")read_world_example"`
+    "(", ")", // parsed as one element `"(,)"`
+    "{\"", "}", // parsed as one element `""{",}"`
+    "\\", "\"", // both are parsed as `\"`
+
+//    "();", // the following completely break parsing
+//    "(real_world_example",
+//    ")", "(",
+//    "{\""
+    ), Some(List("\"t")), "(get(\"A\") + get(\"A\")).ok", "call(A, B).ok")))
 
   test("Composite type Lifted support") {
     Await.result(db.run(