Skip to content

CSVColParser: correctly set nil values in Rows #318

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 10, 2023
Merged

CSVColParser: correctly set nil values in Rows #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd971de
CSVColParser: correctly set nil values in Rows
IvoGoman Aug 9, 2023
4a9308e
Update rows_test.go
IvoGoman Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const invalidate = "☠☠☠ MEMORY OVERWRITTEN ☠☠☠ "
// CSVColumnParser is a function which converts trimmed csv
// column string to a []byte representation. Currently
// transforms NULL to nil
var CSVColumnParser = func(s string) []byte {
var CSVColumnParser = func(s string) interface{} {
switch {
case strings.ToLower(s) == "null":
return nil
Expand Down
8 changes: 6 additions & 2 deletions rows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ func TestRowsScanError(t *testing.T) {

func TestCSVRowParser(t *testing.T) {
t.Parallel()
rs := NewRows([]string{"col1", "col2"}).FromCSVString("a,NULL")
rs := NewRows([]string{"col1", "col2", "col3"}).FromCSVString("a,NULL,NULL")
db, mock, err := New()
if err != nil {
t.Fatalf("an error '%s' was not expected when opening a stub database connection", err)
Expand All @@ -448,9 +448,10 @@ func TestCSVRowParser(t *testing.T) {
defer rw.Close()
var col1 string
var col2 []byte
var col3 *string

rw.Next()
if err = rw.Scan(&col1, &col2); err != nil {
if err = rw.Scan(&col1, &col2, &col3); err != nil {
t.Fatalf("unexpected error: %s", err)
}
if col1 != "a" {
Expand All @@ -459,6 +460,9 @@ func TestCSVRowParser(t *testing.T) {
if col2 != nil {
t.Fatalf("expected col2 to be nil, but got [%T]:%+v", col2, col2)
}
if col3 != nil {
t.Fatalf("expected col3 to be nil, but got [%T]:%+v", col3, col3)
}
}

func TestCSVParserInvalidInput(t *testing.T) {
Expand Down