Upgrade golangci-lint configuration and fix some linter issues

Author: hslatman

.golangci.yml

@@ -1,3 +1,7 @@
-issues:
-  exclude:
-    - "SA1019: .* has been deprecated since Go 1.*: Drivers should implement .*"
+version: 2
+linters:
+  exclusions:
+    rules:
+      - linters:
+          - staticcheck
+        text: "SA1019: .* has been deprecated since Go 1.*: Drivers should implement .*" # TODO: upgrade Go version, and drop these functions?

conn.go

@@ -129,7 +129,7 @@ func (c wrappedParentConn) BeginTx(ctx context.Context, opts driver.TxOptions) (
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	default:
-		return c.Conn.Begin()
+		return c.Begin()
 	}
 }
 
@@ -142,7 +142,7 @@ func (c wrappedParentConn) PrepareContext(ctx context.Context, query string) (dr
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	default:
-		return c.Conn.Prepare(query)
+		return c.Prepare(query)
 	}
 }
 

conn_test.go

@@ -124,7 +124,7 @@ func TestConnQueryContext_PassWrappedRowContext(t *testing.T) {
 	}
 
 	rows.Next()
-	rows.Close()
+	_ = rows.Close()
 
 	if !ti.RowsCloseValid {
 		t.Error("RowsClose context not valid")
@@ -169,7 +169,7 @@ func TestConnPrepareContext_PassWrappedStmtContext(t *testing.T) {
 		t.Fatalf("Prepare failed: %s", err)
 	}
 
-	stmt.Close()
+	_ = stmt.Close()
 
 	if !ti.StmtCloseValid {
 		t.Error("StmtClose context not valid")

stmt.go

@@ -89,7 +89,7 @@ func (s wrappedParentStmt) QueryContext(ctx context.Context, args []driver.Named
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	}
-	return s.Stmt.Query(dargs)
+	return s.Query(dargs)
 }
 
 func (s wrappedParentStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (res driver.Result, err error) {
@@ -106,5 +106,5 @@ func (s wrappedParentStmt) ExecContext(ctx context.Context, args []driver.NamedV
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	}
-	return s.Stmt.Exec(dargs)
+	return s.Exec(dargs)
 }

stmt_test.go

@@ -89,8 +89,8 @@ func TestStmtQueryContext_PassWrappedRowContext(t *testing.T) {
 	}
 
 	rows.Next()
-	rows.Close()
-	stmt.Close()
+	_ = rows.Close()
+	_ = stmt.Close()
 
 	if !ti.RowsNextValid {
 		t.Error("RowsNext context not valid")