[BugFix] Fix typo in StringLiteral toSQL caused by mixing single quot…

…es within double quotes (#13102)
StarRocks · Nov 14, 2022 · 7b609b9 · 7b609b9
1 parent 09f01a0
commit 7b609b9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/StringLiteral.java b/fe/fe-core/src/main/java/com/starrocks/analysis/StringLiteral.java
@@ -119,8 +119,11 @@ public boolean isMinValue() {
     @Override
     public String toSqlImpl() {
         String sql = value;
-        if (value != null && value.contains("\\")) {
-            sql = value.replace("\\", "\\\\");
+        if (value != null) {
+            if (value.contains("\\")) {
+                sql = value.replace("\\", "\\\\");
+            }
+            sql = sql.replace("'", "\\'");
         }
         return "'" + sql + "'";
     }
@@ -161,7 +164,7 @@ public double getDoubleValue() {
      * @throws AnalysisException when entire given string cannot be transformed into a date
      */
     private LiteralExpr convertToDate(Type targetType) throws AnalysisException {
-        LiteralExpr newLiteral = null;
+        LiteralExpr newLiteral;
         try {
             newLiteral = new DateLiteral(value, targetType);
         } catch (AnalysisException e) {
@@ -221,14 +224,6 @@ public Expr uncheckedCastTo(Type targetType) throws AnalysisException {
         return super.uncheckedCastTo(targetType);
     }
 
-    public Expr castToNontypedNumericLiteral() throws AnalysisException {
-        try {
-            return new DecimalLiteral(this.getValue());
-        } catch (Throwable e) {
-            return uncheckedCastTo(Type.DOUBLE);
-        }
-    }
-
     @Override
     public void write(DataOutput out) throws IOException {
         super.write(out);

diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AnalyzeSingleTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AnalyzeSingleTest.java
@@ -335,10 +335,16 @@ public void testExpression() {
         Assert.assertEquals("'\"'", AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
         statement = (QueryStatement) analyzeSuccess("select \"7\\\"\\\"\"");
         Assert.assertEquals("'7\"\"'", AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
-        statement = (QueryStatement) analyzeWithoutTestView("select '7'''");
-        Assert.assertEquals("'7''", AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
+        statement = (QueryStatement) analyzeSuccess("select '7'''");
+        Assert.assertEquals("'7\\''", AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
         statement = (QueryStatement) analyzeSuccess("SELECT '7\\'\\''");
-        Assert.assertEquals("'7'''", AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
+        Assert.assertEquals("'7\\'\\''", AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
+        statement = (QueryStatement) analyzeSuccess("select \"Hello ' World ' !\"");
+        Assert.assertEquals("'Hello \\' World \\' !'",
+                AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
+        statement = (QueryStatement) analyzeSuccess("select 'Hello \" World \" !'");
+        Assert.assertEquals("'Hello \" World \" !'",
+                AST2SQL.toString(statement.getQueryRelation().getOutputExpression().get(0)));
 
         analyzeSuccess("select @@`sql_mode`");
     }