Merge 0d2de25 into 9a15f1a

helpers.go

@@ -10,7 +10,7 @@ import (
 
 var (
 	escaper   = strings.NewReplacer(`\`, `\\`, `'`, `\'`)
-	unescaper = strings.NewReplacer(`\\`, `\`, `\'`, `'`)
+	unescaper = strings.NewReplacer(`\\`, `\`, `\'`, `'`, `\n`, "\n", `\t`, "\t", `\r`, "\r")
 )
 
 func escape(s string) string {

rows.go

@@ -11,6 +11,7 @@ import (
 func newTextRows(c *conn, body io.ReadCloser, location *time.Location, useDBLocation bool) (*textRows, error) {
 	tsvReader := csv.NewReader(body)
 	tsvReader.Comma = '\t'
+	tsvReader.LazyQuotes = true
 
 	columns, err := tsvReader.Read()
 	if err != nil {

rows_test.go

@@ -53,3 +53,33 @@ func TestTextRows(t *testing.T) {
 	assert.NoError(t, rows.Close())
 	assert.Empty(t, data)
 }
+
+func TestTextRowsQuoted(t *testing.T) {
+	buf := bytes.NewReader([]byte("text\nArray(String)\n['Quote: \"here\"']"))
+	rows, err := newTextRows(&conn{}, &bufReadCloser{buf}, time.Local, false)
+	if !assert.NoError(t, err) {
+		return
+	}
+	assert.Equal(t, []string{"text"}, rows.Columns())
+	assert.Equal(t, []string{"Array(String)"}, rows.types)
+	dest := make([]driver.Value, 1)
+	if !assert.NoError(t, rows.Next(dest)) {
+		return
+	}
+	assert.Equal(t, []driver.Value{[]string{"Quote: \"here\""}}, dest)
+}
+
+func TestTextRowsNewLine(t *testing.T) {
+	buf := bytes.NewReader([]byte("text\nString\nHello\\nThere"))
+	rows, err := newTextRows(&conn{}, &bufReadCloser{buf}, time.Local, false)
+	if !assert.NoError(t, err) {
+		return
+	}
+	assert.Equal(t, []string{"text"}, rows.Columns())
+	assert.Equal(t, []string{"String"}, rows.types)
+	dest := make([]driver.Value, 1)
+	if !assert.NoError(t, rows.Next(dest)) {
+		return
+	}
+	assert.Equal(t, []driver.Value{"Hello\nThere"}, dest)
+}