Pass contexts to checkBadConn and HandleError

bulkcopy.go

@@ -237,7 +237,7 @@ func (b *Bulk) Done() (rowcount int64, err error) {
 	reader := startReading(b.cn.sess, b.ctx, nil)
 	err = reader.iterateResponse()
 	if err != nil {
-		return 0, b.cn.checkBadConn(err)
+		return 0, b.cn.checkBadConn(b.ctx, err)
 	}
 
 	return reader.rowCount, nil

mssql.go

@@ -174,7 +174,7 @@ func (c *Conn) IsValid() bool {
 	return c.connectionGood
 }
 
-func (c *Conn) checkBadConn(err error) error {
+func (c *Conn) checkBadConn(queryCtx context.Context, err error) error {
 	// this is a hack to address Issue #275
 	// we set connectionGood flag to false if
 	// error indicates that connection is not usable
@@ -191,7 +191,7 @@ func (c *Conn) checkBadConn(err error) error {
 	case io.EOF:
 		c.connectionGood = false
 		// fixme: This is just a POC. The arguments aren't fully populated.
-		return c.errHandler.HandleError(context.TODO(), context.TODO(), "", c.connectionGood, driver.ErrBadConn)
+		return c.errHandler.HandleError(queryCtx, c.transactionCtx, "fixme", c.connectionGood, driver.ErrBadConn)
 	case driver.ErrBadConn:
 		// It is an internal programming error if driver.ErrBadConn
 		// is ever passed to this function. driver.ErrBadConn should
@@ -208,7 +208,7 @@ func (c *Conn) checkBadConn(err error) error {
 	}
 
 	// fixme: This is just a POC. The arguments aren't fully populated.
-	return c.errHandler.HandleError(context.TODO(), context.TODO(), "", c.connectionGood, err)
+	return c.errHandler.HandleError(queryCtx, c.transactionCtx, "fixme", c.connectionGood, err)
 }
 
 func (c *Conn) clearOuts() {
@@ -219,20 +219,19 @@ func (c *Conn) simpleProcessResp(ctx context.Context) error {
 	reader := startReading(c.sess, ctx, c.outs)
 	c.clearOuts()
 
-	var resultError error
 	err := reader.iterateResponse()
 	if err != nil {
-		return c.checkBadConn(err)
+		return c.checkBadConn(ctx, err)
 	}
-	return resultError
+	return nil
 }
 
 func (c *Conn) Commit() error {
 	if !c.connectionGood {
 		return driver.ErrBadConn
 	}
 	if err := c.sendCommitRequest(); err != nil {
-		return c.checkBadConn(err)
+		return c.checkBadConn(c.transactionCtx, err)
 	}
 	return c.simpleProcessResp(c.transactionCtx)
 }
@@ -259,7 +258,7 @@ func (c *Conn) Rollback() error {
 		return driver.ErrBadConn
 	}
 	if err := c.sendRollbackRequest(); err != nil {
-		return c.checkBadConn(err)
+		return c.checkBadConn(c.transactionCtx, err)
 	}
 	return c.simpleProcessResp(c.transactionCtx)
 }
@@ -291,7 +290,7 @@ func (c *Conn) begin(ctx context.Context, tdsIsolation isoLevel) (tx driver.Tx,
 	}
 	err = c.sendBeginRequest(ctx, tdsIsolation)
 	if err != nil {
-		return nil, c.checkBadConn(err)
+		return nil, c.checkBadConn(ctx, err)
 	}
 	tx, err = c.processBeginResponse(ctx)
 	if err != nil {
@@ -600,7 +599,7 @@ func (s *Stmt) queryContext(ctx context.Context, args []namedValue) (rows driver
 		return nil, driver.ErrBadConn
 	}
 	if err = s.sendQuery(args); err != nil {
-		return nil, s.c.checkBadConn(err)
+		return nil, s.c.checkBadConn(ctx, err)
 	}
 	return s.processQueryResponse(ctx)
 }
@@ -633,7 +632,7 @@ loop:
 					if token.isError() {
 						// need to cleanup cancellable context
 						cancel()
-						return nil, s.c.checkBadConn(token.getError())
+						return nil, s.c.checkBadConn(ctx, token.getError())
 					}
 				case ReturnStatus:
 					s.c.sess.setReturnStatus(token)
@@ -642,7 +641,7 @@ loop:
 		} else {
 			// need to cleanup cancellable context
 			cancel()
-			return nil, s.c.checkBadConn(err)
+			return nil, s.c.checkBadConn(ctx, err)
 		}
 	}
 	res = &Rows{stmt: s, reader: reader, cols: cols, cancel: cancel}
@@ -658,7 +657,7 @@ func (s *Stmt) exec(ctx context.Context, args []namedValue) (res driver.Result,
 		return nil, driver.ErrBadConn
 	}
 	if err = s.sendQuery(args); err != nil {
-		return nil, s.c.checkBadConn(err)
+		return nil, s.c.checkBadConn(ctx, err)
 	}
 	if res, err = s.processExec(ctx); err != nil {
 		return nil, err
@@ -671,7 +670,7 @@ func (s *Stmt) processExec(ctx context.Context) (res driver.Result, err error) {
 	s.c.clearOuts()
 	err = reader.iterateResponse()
 	if err != nil {
-		return nil, s.c.checkBadConn(err)
+		return nil, s.c.checkBadConn(ctx, err)
 	}
 	return &Result{s.c, reader.rowCount}, nil
 }
@@ -741,15 +740,15 @@ func (rc *Rows) Next(dest []driver.Value) error {
 					return nil
 				case doneStruct:
 					if tokdata.isError() {
-						return rc.stmt.c.checkBadConn(tokdata.getError())
+						return rc.stmt.c.checkBadConn(rc.reader.ctx, tokdata.getError())
 					}
 				case ReturnStatus:
 					rc.stmt.c.sess.setReturnStatus(tokdata)
 				}
 			}
 
 		} else {
-			return rc.stmt.c.checkBadConn(err)
+			return rc.stmt.c.checkBadConn(rc.reader.ctx, err)
 		}
 	}
 }