Skip to content

Commit 0d3fa9a

Browse files
committed
Line number now counting from 1.
1 parent e3ec8c0 commit 0d3fa9a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

csvplus.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,8 @@ func (r *Reader) Iterate(fn RowFunc) error {
10561056

10571057
// header
10581058
var header map[string]int
1059-
var lineNo uint64
1059+
1060+
lineNo := uint64(1)
10601061

10611062
if r.headerFromFirstRow {
10621063
if header, err = r.makeHeader(reader); err != nil {
@@ -1184,7 +1185,7 @@ func mapError(err error, lineNo uint64) error {
11841185

11851186
// DataSourceError is the type of the error returned from Reader.Iterate method.
11861187
type DataSourceError struct {
1187-
Line uint64
1188+
Line uint64 // counting from 1
11881189
Err error
11891190
}
11901191

csvplus_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ func TestErrors(t *testing.T) {
808808
// invalid column name
809809
err := Take(FromFile(tempFiles["people"]).SelectColumns("id", "name", "xxx"))(neverCalled)
810810

811-
if err == nil || !strings.HasSuffix(err.Error(), "Row 0: Column not found: xxx") {
811+
if err == nil || !strings.HasSuffix(err.Error(), "Row 1: Column not found: xxx") {
812812
t.Error("Unexpected error:", err)
813813
return
814814
}
@@ -889,7 +889,7 @@ func TestErrors(t *testing.T) {
889889

890890
err = people(neverCalled)
891891

892-
if err == nil || !strings.HasSuffix(err.Error(), `Row 0: Misplaced column "surname": expected at pos. 3, but found at pos. 2`) {
892+
if err == nil || !strings.HasSuffix(err.Error(), `Row 1: Misplaced column "surname": expected at pos. 3, but found at pos. 2`) {
893893
t.Error("Unexpected error:", err)
894894
return
895895
}
@@ -901,7 +901,7 @@ func TestErrors(t *testing.T) {
901901

902902
err = people(neverCalled)
903903

904-
if err == nil || !strings.HasSuffix(err.Error(), `Row 0: Misplaced column "surname": expected at pos. 25, but found at pos. 2`) {
904+
if err == nil || !strings.HasSuffix(err.Error(), `Row 1: Misplaced column "surname": expected at pos. 25, but found at pos. 2`) {
905905
t.Error("Unexpected error:", err)
906906
return
907907
}

0 commit comments

Comments
 (0)