aboutsummaryrefslogtreecommitdiff
path: root/internal/database/database.go
diff options
context:
space:
mode:
authorJonathan Amsterdam <jba@google.com>2020-06-08 10:42:06 -0400
committerJonathan Amsterdam <jba@google.com>2020-06-08 14:56:55 +0000
commit6a8145776b23af6c57efd83c264553849ad80c71 (patch)
tree63a3e24b59f3ec527d0c8089169756af7a0c95ad /internal/database/database.go
parent75ff82f2175169b93c222909e891b37d58427a74 (diff)
downloadgo-x-pkgsite-6a8145776b23af6c57efd83c264553849ad80c71.tar.xz
internal/database: assign to right err variable
We were assigning an error to a dead variable (the `err` defined in the `QueryContext` call shadowed the one above the `if`). Caught by staticcheck. Change-Id: Ifbf8a78c336ab1918fdf5714548b286b73199ce9 Reviewed-on: https://team-review.git.corp.google.com/c/golang/discovery/+/765142 Reviewed-by: Julie Qiu <julieqiu@google.com> CI-Result: Cloud Build <devtools-proctor-result-processor@system.gserviceaccount.com>
Diffstat (limited to 'internal/database/database.go')
-rw-r--r--internal/database/database.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/database/database.go b/internal/database/database.go
index af1ad8d4..0499a199 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -279,7 +279,8 @@ func (db *DB) bulkInsert(ctx context.Context, table string, columns, returningCo
if returningColumns == nil {
_, err = stmt.ExecContext(ctx, valueSlice...)
} else {
- rows, err := stmt.QueryContext(ctx, valueSlice...)
+ var rows *sql.Rows
+ rows, err = stmt.QueryContext(ctx, valueSlice...)
if err != nil {
return err
}