Merge pull request #47 from vertical-blank/fix-quote-operator

fix quote operator and test

Author: vertical-blank

src/main/java/com/github/vertical_blank/sqlformatter/languages/StringLiteral.java

@@ -51,7 +51,13 @@ private enum Preset {
     /** q'' */
     Q_SINGLE_QUOTE(
         StringLiteral.Q_SINGLE_QUOTE,
-        "(?i)((n?q'\\[.*($|\\]'))+)|((n?q'\\{.*($|\\}'))+)|((n?q'\\<.*($|\\>'))+)|((n?q'\\(.*($|\\)'))+)"),
+        "(?i)"
+            + String.join(
+                "|",
+                "((n?q'\\{(?:(?!\\}'|\\\\).)*\\}')+)",
+                "((n?q'\\[(?:(?!\\]'|\\\\).)*\\]')+)",
+                "((n?q'<(?:(?!>'|\\\\).)*>')+)",
+                "((n?q'\\((?:(?!\\)'|\\\\).)*\\)')+)")),
     // single_quote("((^'((?:''|[^'])*)')+)"),
     E_SINGLE_QUOTE(StringLiteral.E_SINGLE_QUOTE, "((E'[^'\\\\]*(?:\\\\.[^'\\\\]*)*('|$))+)"),
     /** U&amp;'' */

src/test/kotlin/com/github/vertical_blank/sqlformatter/features/Strings.kt

@@ -68,14 +68,20 @@ fun Suite.supportsStrings(formatter: SqlFormatter.Formatter, stringTypes: List<S
 
     if (stringTypes.contains(StringLiteral.Q_SINGLE_QUOTE)) {
       it("supports Oracle quotation operator") {
-        expect(format("Q'[I'm boy]'")).toBe("Q'[I'm boy]'")
-        expect(format("Q'{I'm boy}'")).toBe("Q'{I'm boy}'")
-        expect(format("Q'<I'm boy>'")).toBe("Q'<I'm boy>'")
-        expect(format("Q'(I'm boy)'")).toBe("Q'(I'm boy)'")
-        expect(format("NQ'[I'm boy]'")).toBe("NQ'[I'm boy]'")
-        expect(format("NQ'{I'm boy}'")).toBe("NQ'{I'm boy}'")
-        expect(format("NQ'<I'm boy>'")).toBe("NQ'<I'm boy>'")
-        expect(format("NQ'(I'm boy)'")).toBe("NQ'(I'm boy)'")
+        expect(format("Q'[I'm boy]',Q'{I'm boy}',Q'<I'm boy>',Q'(I'm boy)',1"))
+            .toBe(
+                """Q'[I'm boy]',
+            |Q'{I'm boy}',
+            |Q'<I'm boy>',
+            |Q'(I'm boy)',
+            |1""".trimMargin())
+        expect(format("NQ'[I'm boy]',NQ'{I'm boy}',NQ'<I'm boy>',NQ'(I'm boy)',1"))
+            .toBe(
+                """NQ'[I'm boy]',
+            |NQ'{I'm boy}',
+            |NQ'<I'm boy>',
+            |NQ'(I'm boy)',
+            |1""".trimMargin())
       }
     }
   }