Skip to content
This repository was archived by the owner on Dec 13, 2023. It is now read-only.

Commit 0a95840

Browse files
committed
Updated row.err usage
1 parent 335976e commit 0a95840

File tree

5 files changed

+67
-6
lines changed

5 files changed

+67
-6
lines changed

README.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,18 @@ https://godoc.org/github.com/MichaelS11/go-cql-driver#example-package--SqlSelect
2121

2222
## Important note:
2323

24-
When calling QueryContext or Query make sure to close the returned rows and check the error. Often an error will only show up after rows is closed.
24+
When done with rows from QueryContext or Query, make sure to check errors from Close and Err
25+
```go
26+
err = rows.Close()
27+
if err != nil {
28+
fmt.Println(err)
29+
return
30+
}
31+
cancel()
32+
33+
err = rows.Err()
34+
if err != nil {
35+
fmt.Println(err)
36+
return
37+
}
38+
```

cqlSql_test.go

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ func TestSqlInsertUpdateSelectDelete(t *testing.T) {
170170
t.Fatal("Close error: ", err)
171171
}
172172
cancel()
173+
err = rows.Err()
174+
if err != nil {
175+
t.Fatal("Err error: ", err)
176+
}
173177

174178
// insert two
175179
ctx, cancel = context.WithTimeout(context.Background(), TimeoutValid)
@@ -212,6 +216,10 @@ func TestSqlInsertUpdateSelectDelete(t *testing.T) {
212216
t.Fatal("Close error: ", err)
213217
}
214218
cancel()
219+
err = rows.Err()
220+
if err != nil {
221+
t.Fatal("Err error: ", err)
222+
}
215223

216224
// update two
217225
ctx, cancel = context.WithTimeout(context.Background(), TimeoutValid)
@@ -254,6 +262,10 @@ func TestSqlInsertUpdateSelectDelete(t *testing.T) {
254262
t.Fatal("Close error: ", err)
255263
}
256264
cancel()
265+
err = rows.Err()
266+
if err != nil {
267+
t.Fatal("Err error: ", err)
268+
}
257269

258270
// delete two
259271
ctx, cancel = context.WithTimeout(context.Background(), TimeoutValid)
@@ -283,6 +295,10 @@ func TestSqlInsertUpdateSelectDelete(t *testing.T) {
283295
t.Fatal("Close error: ", err)
284296
}
285297
cancel()
298+
err = rows.Err()
299+
if err != nil {
300+
t.Fatal("Err error: ", err)
301+
}
286302

287303
// delete two
288304
ctx, cancel = context.WithTimeout(context.Background(), TimeoutValid)
@@ -305,6 +321,10 @@ func TestSqlInsertUpdateSelectDelete(t *testing.T) {
305321
t.Fatal("QueryContext no error")
306322
}
307323
cancel()
324+
err = rows.Err()
325+
if err != nil {
326+
t.Fatal("Err error: ", err)
327+
}
308328

309329
ctx, cancel = context.WithTimeout(context.Background(), TimeoutValid)
310330
rows, err = db.QueryContext(ctx, "select int_data from "+KeyspaceName+"."+TableName+" where int_data = ?")
@@ -315,6 +335,10 @@ func TestSqlInsertUpdateSelectDelete(t *testing.T) {
315335
t.Fatal("QueryContext no error")
316336
}
317337
cancel()
338+
err = rows.Err()
339+
if err != nil {
340+
t.Fatal("Err error: ", err)
341+
}
318342

319343
err = db.Close()
320344
if err != nil {
@@ -379,6 +403,10 @@ func TestSqlSelectLoop(t *testing.T) {
379403
t.Fatal("Close error: ", err)
380404
}
381405
cancel()
406+
err = rows.Err()
407+
if err != nil {
408+
t.Fatal("Err error: ", err)
409+
}
382410
}
383411

384412
err = db.Close()
@@ -433,6 +461,10 @@ func TestSqTruncate(t *testing.T) {
433461
t.Fatal("Close error: ", err)
434462
}
435463
cancel()
464+
err = rows.Err()
465+
if err != nil {
466+
t.Fatal("Err error: ", err)
467+
}
436468

437469
err = db.Close()
438470
if err != nil {

exampleSqlGo110_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ func Example_sqlConnector() {
8181
fmt.Println("Close error is not nil:", err)
8282
return
8383
}
84-
cancel()
84+
85+
err = rows.Err()
86+
if err != nil {
87+
fmt.Println("Err error is not nil:", err)
88+
return
89+
}
8590

8691
err = db.Close()
8792
if err != nil {

exampleSql_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ func Example_sqlSelect() {
7575
fmt.Println("Close error is not nil:", err)
7676
return
7777
}
78-
cancel()
78+
79+
err = rows.Err()
80+
if err != nil {
81+
fmt.Println("Err error is not nil:", err)
82+
return
83+
}
7984

8085
err = db.Close()
8186
if err != nil {
@@ -166,7 +171,12 @@ func Example_sqlStatement() {
166171
fmt.Println("Close error is not nil:", err)
167172
return
168173
}
169-
cancel()
174+
175+
err = rows.Err()
176+
if err != nil {
177+
fmt.Println("Err error is not nil:", err)
178+
return
179+
}
170180

171181
err = db.Close()
172182
if err != nil {

rows_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ func TestRowsColumns(t *testing.T) {
1919
if columns[0] != "cql_version" {
2020
t.Fatalf("Columns[0] - received: %v - expected: %v ", columns[0], "cql_version")
2121
}
22-
2322
err := rows.Close()
2423
if err != nil {
2524
t.Fatalf("Close error - received: %v - expected: %v ", err, nil)
2625
}
26+
2727
err = stmt.Close()
2828
if err != nil {
2929
t.Fatalf("Close error - received: %v - expected: %v ", err, nil)
@@ -72,11 +72,11 @@ func TestRowsNext(t *testing.T) {
7272
if len(dest) != 0 {
7373
t.Fatalf("Next len - received: %v - expected: %v ", len(dest), 1)
7474
}
75-
7675
err = rows.Close()
7776
if err != nil {
7877
t.Fatalf("Close error - received: %v - expected: %v ", err, nil)
7978
}
79+
8080
err = stmt.Close()
8181
if err != nil {
8282
t.Fatalf("Close error - received: %v - expected: %v ", err, nil)

0 commit comments

Comments
 (0)