From 3bc2e6ef42af1e251cafcfcd1726e182f75fee89 Mon Sep 17 00:00:00 2001
From: tuminglei <tmlneu@gmail.com>
Date: Wed, 15 Mar 2023 09:33:31 +0800
Subject: [PATCH] release 0.22.0-M1

---
 README.md                                     | 26 +++++++++----------
 build.sbt                                     |  2 +-
 .../slickpg/utils/PgTokenHelper.scala         |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 1cb4814d..f9fb788f 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Slick-pg
 - Pg_trgm
 
 
-** _Tested on `PostgreSQL 11/12/13/14` with `Slick 3.4.1`._
+** _Tested on `PostgreSQL 11/12/13/14` with `Slick 3.5.0-M2`._
 ** _`Java 8`+ is required._
 
 
@@ -197,49 +197,49 @@ Install
 -------
 To use `slick-pg` in [sbt](http://www.scala-sbt.org/ "slick-sbt") project, add the following to your project file:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg" % "0.22.0-M1"
 ```
 
 > If you need `joda-time` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_joda-time" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_joda-time" % "0.22.0-M1"
 ```
 
 > If you need `jts` geom support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_jts" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_jts" % "0.22.0-M1"
 or
-libraryDependencies += "com.github.tminglei" %% "slick-pg_jts_lt" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_jts_lt" % "0.22.0-M1"
 ```
 
 > If you need `json4s` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_json4s" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_json4s" % "0.22.0-M1"
 ```
 
 > If you need `play-json` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_play-json" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_play-json" % "0.22.0-M1"
 ```
 
 > If you need `spray-json` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_spray-json" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_spray-json" % "0.22.0-M1"
 ```
 
 > If you need `argonaut json` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_argonaut" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_argonaut" % "0.22.0-M1"
 ```
 
 > If you need `circe json` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_circe-json" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_circe-json" % "0.22.0-M1"
 ```
 
 > If you need `uPickle json` support, pls append dependency:
 ```scala
-libraryDependencies += "com.github.tminglei" %% "slick-pg_upickle-json" % "0.21.1"
+libraryDependencies += "com.github.tminglei" %% "slick-pg_upickle-json" % "0.22.0-M1"
 ```
 
 
@@ -247,8 +247,8 @@ Or, in [maven](http://maven.apache.org/ "maven") project, you can add `slick-pg`
 ```xml
 <dependency>
     <groupId>com.github.tminglei</groupId>
-    <artifactId>slick-pg_2.12</artifactId>
-    <version>0.21.1</version>
+    <artifactId>slick-pg_2.13</artifactId>
+    <version>0.22.0-M1</version>
 </dependency>
 <!-- other addons if necessary -->
 ...
diff --git a/build.sbt b/build.sbt
index 2ad6b053..a493196e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,7 @@ lazy val commonSettings = Seq(
   organizationName := "slick-pg",
   organization := "com.github.tminglei",
   name := "slick-pg",
-  version := "0.21.1",
+  version := "0.22.0-M1",
 
   scalaVersion := scala213,
   crossScalaVersions := Seq(scala213),
diff --git a/core/src/main/scala/com/github/tminglei/slickpg/utils/PgTokenHelper.scala b/core/src/main/scala/com/github/tminglei/slickpg/utils/PgTokenHelper.scala
index 2a431b85..1cc47167 100644
--- a/core/src/main/scala/com/github/tminglei/slickpg/utils/PgTokenHelper.scala
+++ b/core/src/main/scala/com/github/tminglei/slickpg/utils/PgTokenHelper.scala
@@ -89,7 +89,7 @@ object PgTokenHelper {
 
   @tailrec
   private def smush(soFar: Seq[Token], remaining: Seq[Token]): List[Token] = (soFar, remaining) match {
-    case (tokens, Seq())                                => tokens.toList
+    case (tokens, empty) if empty.isEmpty               => tokens.toList
     case (lead :+ Chunk(prefix), Chunk(suffix) +: tail) => smush(lead :+ Chunk(prefix + suffix), tail)
     case (lead, middle +: tail)                         => smush(lead :+ middle, tail)
   }