fix: correctly escape single quotes in pg arrays

uptrace · Oct 23, 2021 · 3010847 · 3010847
1 parent a2faf78
commit 3010847
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/dialect/pgdialect/append.go b/dialect/pgdialect/append.go
@@ -286,7 +286,7 @@ func arrayAppendString(b []byte, s string) []byte {
 		case 0:
 			// ignore
 		case '\'':
-			b = append(b, "'''"...)
+			b = append(b, "''"...)
 		case '"':
 			b = append(b, '\\', '"')
 		case '\\':

diff --git a/dialect/pgdialect/array_parser.go b/dialect/pgdialect/array_parser.go
@@ -110,6 +110,14 @@ func (p *arrayParser) readSubstring() ([]byte, error) {
 			}
 			continue
 		}
+		if c == '\'' && next == '\'' {
+			p.buf = append(p.buf, next)
+			c, err = p.readByte()
+			if err != nil {
+				return nil, err
+			}
+			continue
+		}
 
 		p.buf = append(p.buf, c)
 		c = next

diff --git a/dialect/pgdialect/array_parser_test.go b/dialect/pgdialect/array_parser_test.go
@@ -13,9 +13,9 @@ func TestArrayParser(t *testing.T) {
 		{`{}`, []string{}},
 		{`{""}`, []string{""}},
 		{`{"\\"}`, []string{`\`}},
-		{`{"''"}`, []string{"''"}},
-		{`{{"''\"{}"}}`, []string{`{"''\"{}"}`}},
-		{`{"''\"{}"}`, []string{`''"{}`}},
+		{`{"''"}`, []string{"'"}},
+		{`{{"'\"{}"}}`, []string{`{"'\"{}"}`}},
+		{`{"'\"{}"}`, []string{`'"{}`}},
 
 		{"{1,2}", []string{"1", "2"}},
 		{"{1,NULL}", []string{"1", ""}},