fix: return Dollar quoted text as StringValue

- fixes #2267

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/expression/StringValue.java

@@ -24,6 +24,7 @@ public final class StringValue extends ASTNodeAccessImpl implements Expression {
             Arrays.asList("N", "U", "E", "R", "B", "RB", "_utf8", "Q");
     private String value = "";
     private String prefix = null;
+    private String quoteStr = "'";
 
     public StringValue() {
         // empty constructor
@@ -35,6 +36,11 @@ public StringValue(String escapedValue) {
                 && escapedValue.endsWith("'")) {
             value = escapedValue.substring(1, escapedValue.length() - 1);
             return;
+        } else if (escapedValue.length() >= 4 && escapedValue.startsWith("$$")
+                && escapedValue.endsWith("$$")) {
+            value = escapedValue.substring(2, escapedValue.length() - 2);
+            quoteStr = "$$";
+            return;
         }
 
         if (escapedValue.length() > 2) {
@@ -68,6 +74,15 @@ public void setPrefix(String prefix) {
         this.prefix = prefix;
     }
 
+    public String getQuoteStr() {
+        return quoteStr;
+    }
+
+    public StringValue setQuoteStr(String quoteStr) {
+        this.quoteStr = quoteStr;
+        return this;
+    }
+
     public String getNotExcapedValue() {
         StringBuilder buffer = new StringBuilder(value);
         int index = 0;
@@ -87,7 +102,7 @@ public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
 
     @Override
     public String toString() {
-        return (prefix != null ? prefix : "") + "'" + value + "'";
+        return (prefix != null ? prefix : "") + quoteStr + value + quoteStr;
     }
 
     public StringValue withPrefix(String prefix) {

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -642,7 +642,8 @@ public <S> StringBuilder visit(StringValue stringValue, S context) {
         if (stringValue.getPrefix() != null) {
             builder.append(stringValue.getPrefix());
         }
-        builder.append("'").append(stringValue.getValue()).append("'");
+        builder.append(stringValue.getQuoteStr()).append(stringValue.getValue())
+                .append(stringValue.getQuoteStr());
 
         return builder;
     }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -820,7 +820,7 @@ TOKEN:
 | < S_CHAR_LITERAL: (
                         (["U","E","N","R","B"]|"RB"|"_utf8")?
                         (
-                            ("'" ( <ESC> | <SPECIAL_ESC> | ~["'", "\\"] )* "'") | ("'" ("''" | ~["'"])* "'")
+                            ("'" ( <ESC> | <SPECIAL_ESC> | ~["'", "\\"] )* "'") | ("'" ("''" | ~["'"])* "'" | "$$" (~["$"])* "$$")
                             // Alternative Oracle Escape Modes
                             | ("q'{" (~[])* "}'")
                             | ("q'(" (~[])* ")'")
@@ -856,7 +856,7 @@ TOKEN:
                     }
                 }
     }
-| < S_QUOTED_IDENTIFIER: "\"" ( "\"\"" | ~["\n","\r","\""])* "\"" | "$$" (~["$"])* "$$" | ("`" (~["\n","\r","`"])+ "`") | ( "[" (~["\n","\r","]"])* "]" ) >
+| < S_QUOTED_IDENTIFIER: "\"" ( "\"\"" | ~["\n","\r","\""])* "\"" | ("`" (~["\n","\r","`"])+ "`") | ( "[" (~["\n","\r","]"])* "]" ) >
     {
         if ( !configuration.getAsBoolean(Feature.allowSquareBracketQuotation)
             && matchedToken.image.charAt(0) == '[' ) {

src/test/java/net/sf/jsqlparser/expression/StringValueTest.java

@@ -10,7 +10,9 @@
 package net.sf.jsqlparser.expression;
 
 import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -93,4 +95,12 @@ public void testParseInput_BYTEA() throws Exception {
         String sqlStr = "VALUES (X'', X'01FF', X'01 bc 2a', X'01' '02')";
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @Test
+    void testDollarQuotesIssue2267() throws JSQLParserException {
+        String sqlStr = "SELECT $$this is a string$$, test, 'text' FROM tbl;";
+        PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        Assertions.assertInstanceOf(StringValue.class, select.getSelectItem(0).getExpression());
+    }
 }