expression: quote json path if necessarily (#37375)

close #25579
pingcap · Aug 25, 2022 · b4b5223 · b4b5223
1 parent a89ef1f
commit b4b5223
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/types/json/binary_functions.go b/types/json/binary_functions.go
@@ -211,7 +211,7 @@ func quoteString(s string) string {
 		ret.WriteString(s[start:])
 	}
 
-	if hasEscaped {
+	if hasEscaped || !isEcmascriptIdentifier(s) {
 		ret.WriteByte('"')
 		return ret.String()
 	}

diff --git a/types/json/binary_test.go b/types/json/binary_test.go
@@ -154,15 +154,15 @@ func TestQuoteString(t *testing.T) {
 		raw    string
 		quoted string
 	}{
-		{raw: "3", quoted: `3`},
+		{raw: "3", quoted: `"3"`},
 		{raw: "hello, \"escaped quotes\" world", quoted: `"hello, \"escaped quotes\" world"`},
 		{raw: "你", quoted: `你`},
 		{raw: "true", quoted: `true`},
 		{raw: "null", quoted: `null`},
 		{raw: `"`, quoted: `"\""`},
-		{raw: `'`, quoted: `'`},
-		{raw: `''`, quoted: `''`},
-		{raw: ``, quoted: ``},
+		{raw: `'`, quoted: `"'"`},
+		{raw: `''`, quoted: `"''"`},
+		{raw: ``, quoted: `""`},
 		{raw: "\\ \" \b \f \n \r \t", quoted: `"\\ \" \b \f \n \r \t"`},
 	}
 

diff --git a/types/json/path_expr.go b/types/json/path_expr.go
@@ -391,7 +391,11 @@ func (pe PathExpression) String() string {
 			}
 		case pathLegKey:
 			s.WriteString(".")
-			s.WriteString(quoteString(leg.dotKey))
+			if leg.dotKey == "*" {
+				s.WriteString(leg.dotKey)
+			} else {
+				s.WriteString(quoteString(leg.dotKey))
+			}
 		case pathLegDoubleAsterisk:
 			s.WriteString("**")
 		}

diff --git a/types/json/path_expr_test.go b/types/json/path_expr_test.go
@@ -95,6 +95,8 @@ func TestPathExprToString(t *testing.T) {
 		{"$.*[2]"},
 		{"$**.a[3]"},
 		{`$."\"hello\""`},
+		{`$."a b"`},
+		{`$."one potato"`},
 	}
 	for _, test := range tests {
 		// copy iterator variable into a new variable, see issue #27779