refactor and enhance tests for array support

tminglei · Apr 3, 2014 · dfd38ae · dfd38ae
1 parent c690b73
commit dfd38ae
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 36 deletions.
diff --git a/core/src/main/scala/com/github/tminglei/slickpg/utils/PGObjectTokenizer.scala b/core/src/main/scala/com/github/tminglei/slickpg/utils/PGObjectTokenizer.scala
@@ -39,6 +39,7 @@ class PGObjectTokenizer extends RegexParsers {
 
   ////////////////////////////////////
   import PGTokens._
+  import PGObjectTokenizer._
   import PGObjectTokenizer.PGElements._
 
   object PGTokenReducer {
@@ -58,21 +59,6 @@ class PGObjectTokenizer extends RegexParsers {
           }
       }
 
-      def unescape(str: String): String =
-        if (str.contains("&#")) {
-          str
-            .replaceAllLiterally("&#39;", "'")
-            .replaceAllLiterally("&#34;", "\"")
-            .replaceAllLiterally("&#92;", "\\")
-            .replaceAllLiterally("&#40;", "(")
-            .replaceAllLiterally("&#41;", ")")
-            .replaceAllLiterally("&#123;", "{")
-            .replaceAllLiterally("&#125;", "}")
-            .replaceAllLiterally("&#91;", "[")
-            .replaceAllLiterally("&#93;", "]")
-            .replaceAllLiterally("&#44;", ",")
-        } else str
-
       // postgres should never return any ws between chunks and commas. for example: (1, ,2, )
       // This case class would handle that:
       // case Chunk(v) if v.trim.isEmpty => null
@@ -83,8 +69,8 @@ class PGObjectTokenizer extends RegexParsers {
           composite.value.collect {
             case v: CTArray   => mergeComposite(v)
             case v: CTRecord  => mergeComposite(v)
-            case CTString(v)  => ValueE(unescape(mergeString(v.filterNot(_.isInstanceOf[BorderToken]))))
-            case Chunk(v) => ValueE(unescape(v))
+            case CTString(v)  => ValueE(unescaped(mergeString(v.filterNot(_.isInstanceOf[BorderToken]))))
+            case Chunk(v) => ValueE(unescaped(v))
             case null => NullE
           }
 
@@ -208,21 +194,6 @@ class PGObjectTokenizer extends RegexParsers {
       def markRequired(str: String): Boolean = MARK_LETTERS findFirstIn str isDefined
       def bypassEscape(str: String): Boolean = RANGE_STRING findFirstIn str isDefined
 
-      def addEscaped(buf: StringBuilder, ch: Char, level: Int, dual: Boolean): Unit =
-        ch match {
-          case '\''  => buf append "&#39;"
-          case '"'   => buf append "&#34;"
-          case '\\'  => buf append "&#92;"
-          case '('   => buf append "&#40;"
-          case ')'   => buf append "&#41;"
-          case '{'   => buf append "&#123;"
-          case '}'   => buf append "&#125;"
-          case '['   => buf append "&#91;"
-          case ']'   => buf append "&#93;"
-          case ','   => buf append "&#44;"
-          case _  =>  buf append ch
-        }
-
       def addMark(buf: StringBuilder, level: Int, dual: Boolean): Unit =
         level match {
           case l if l < 0 => // do nothing
@@ -265,11 +236,11 @@ class PGObjectTokenizer extends RegexParsers {
               addMark(buf, level, dual)
               if (bypassEscape(v)) buf append v
               else {
-                for(ch <- v) addEscaped(buf, ch, level + 1, dual)
+                for(ch <- v) buf append escaped(ch)
               }
               addMark(buf, level, dual)
             } else {
-              for(ch <- v) addEscaped(buf, ch, level + 1, dual)
+              for(ch <- v) buf append escaped(ch)
             }
           }
           case NullE  =>  // do nothing
@@ -356,4 +327,36 @@ object PGObjectTokenizer {
   def reverse(elem: PGElements.Element): String = {
     new PGObjectTokenizer().reverse(elem)
   }
+
+  /// helper methods ///////////////////////
+
+  def escaped(ch: Char): String =
+    ch match {
+      case '\''  => "&#39;"
+      case '"'   => "&#34;"
+      case '\\'  => "&#92;"
+      case '('   => "&#40;"
+      case ')'   => "&#41;"
+      case '{'   => "&#123;"
+      case '}'   => "&#125;"
+      case '['   => "&#91;"
+      case ']'   => "&#93;"
+      case ','   => "&#44;"
+      case _  =>  String.valueOf(ch)
+    }
+
+  def unescaped(str: String): String =
+    if (str.contains("&#")) {
+      str
+        .replaceAllLiterally("&#39;", "'")
+        .replaceAllLiterally("&#34;", "\"")
+        .replaceAllLiterally("&#92;", "\\")
+        .replaceAllLiterally("&#40;", "(")
+        .replaceAllLiterally("&#41;", ")")
+        .replaceAllLiterally("&#123;", "{")
+        .replaceAllLiterally("&#125;", "}")
+        .replaceAllLiterally("&#91;", "[")
+        .replaceAllLiterally("&#93;", "]")
+        .replaceAllLiterally("&#44;", ",")
+    } else str
 }
diff --git a/src/test/scala/com/github/tminglei/slickpg/PgArraySupportTest.scala b/src/test/scala/com/github/tminglei/slickpg/PgArraySupportTest.scala
@@ -30,7 +30,7 @@ class PgArraySupportTest {
 
   val testRec1 = ArrayBean(33L, List(101, 102, 103), List(1L, 3L, 5L, 7L), Some(List("str1", "str3")))
   val testRec2 = ArrayBean(37L, List(101, 103), List(11L, 31L, 5L), Some(List("str11", "str3")))
-  val testRec3 = ArrayBean(41L, List(103, 101), List(11L, 5L, 31L), Some(List("str11", "str5", "str3")))
+  val testRec3 = ArrayBean(41L, List(103, 101), List(11L, 5L, 31L), Some(List("(s)", "str5", "str3")))
 
   @Test
   def testArrayFunctions(): Unit = {
@@ -67,7 +67,8 @@ class PgArraySupportTest {
 
       val q6 = ArrayTests.filter(5L.bind <= _.longArr.all).map(_.strArr.unnest)
       println(s"[array] 'unnest' sql = ${q6.selectStatement}")
-      assertEquals((testRec2.strArr.get ++ testRec3.strArr.get).toList, q6.list().map(_.orNull))
+      assertEquals((testRec2.strArr.get ++ testRec3.strArr.get).toList,
+          q6.list().map(_.map(utils.PGObjectTokenizer.unescaped).orNull))
 
       val q7 = ArrayTests.filter(_.id === 33L.bind).map(_.intArr ++ List(105, 107).bind)
       println(s"[array] concatenate1 sql = ${q7.selectStatement}")