Fix scanString (#439)

chaisql · Jan 25, 2022 · a5e6f6c · a5e6f6c
1 parent 2f8ba99
commit a5e6f6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/internal/sql/scanner/scanner.go b/internal/sql/scanner/scanner.go
@@ -604,6 +604,10 @@ func scanString(r io.RuneReader) (string, error) {
 			ch1, _, _ := r.ReadRune()
 			if ch1 == 'n' {
 				_, _ = buf.WriteRune('\n')
+			} else if ch1 == 'r' {
+				_, _ = buf.WriteRune('\r')
+			} else if ch1 == 't' {
+				_, _ = buf.WriteRune('\t')
 			} else if ch1 == '\\' {
 				_, _ = buf.WriteRune('\\')
 			} else if ch1 == '"' {

diff --git a/internal/sql/scanner/scanner_test.go b/internal/sql/scanner/scanner_test.go
@@ -268,6 +268,10 @@ func TestScanString(t *testing.T) {
 		{in: `"foo bar"`, out: `foo bar`},
 		{in: `'foo bar'`, out: `foo bar`},
 		{in: `"foo\nbar"`, out: "foo\nbar"},
+		{in: `"foo\rbar"`, out: "foo\rbar"},
+		{in: `"foo\tbar"`, out: "foo\tbar"},
+		{in: `"foo\r\nbar"`, out: "foo\r\nbar"},
+		{in: `"foo\r\nbar\r\n\trm"`, out: "foo\r\nbar\r\n\trm"},
 		{in: `"foo\\bar"`, out: `foo\bar`},
 		{in: `"foo\"bar"`, out: `foo"bar`},
 		{in: `'foo\'bar'`, out: `foo'bar`},