Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

skip only not string #116

Merged
merged 8 commits into from
May 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rows.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (r *textRows) Next(dest []driver.Value) error {

// skip row before WITH TOTALS,
// not but do not skip an empty line if it is part of the result
if len(row) == 1 && row[0] == "" && len(dest) != 1 {
if len(row) == 1 && row[0] == "" {
row, err = r.tsv.Read()
if err != nil {
return err
Expand Down
45 changes: 30 additions & 15 deletions rows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,6 @@ func TestTextRowsNewLine(t *testing.T) {
assert.Equal(t, []driver.Value{"Hello\nThere"}, dest)
}

func TestTextRowsEmpty(t *testing.T) {
buf := bytes.NewReader([]byte("text\nString\n\n"))
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{""}, dest)
}

func TestTextRowsWithStartsDoubleQuotes(t *testing.T) {
buf := bytes.NewReader([]byte("text\nString\n\"\n"))
rows, err := newTextRows(&conn{}, &bufReadCloser{buf}, time.Local, false)
Expand Down Expand Up @@ -146,3 +131,33 @@ func TestTextRowsWithEmptyQuotes(t *testing.T) {
}
assert.Equal(t, []driver.Value{`""`}, dest)
}

func TestInt32RowsEmpty(t *testing.T) {
buf := bytes.NewReader([]byte("text\nInt64\n\n1\n"))
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{"Int64"}, rows.types)
dest := make([]driver.Value, 1)
if !assert.NoError(t, rows.Next(dest)) {
return
}
assert.Equal(t, []driver.Value{int64(1)}, dest)
}

func TestFloat64RowsEmpty(t *testing.T) {
buf := bytes.NewReader([]byte("text\nFloat64\n\n1.0\n"))
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{"Float64"}, rows.types)
dest := make([]driver.Value, 1)
if !assert.NoError(t, rows.Next(dest)) {
return
}
assert.Equal(t, []driver.Value{float64(1)}, dest)
}