From 04e155bf64e82451078b22a155b2ce1855fd1d03 Mon Sep 17 00:00:00 2001
From: Nicolas Ferrario <nferrario@mediamath.com>
Date: Wed, 16 Feb 2022 17:07:25 +0100
Subject: [PATCH] Improvements

---
 rowset.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/rowset.go b/rowset.go
index f1738b1..4e86a18 100644
--- a/rowset.go
+++ b/rowset.go
@@ -147,7 +147,9 @@ func (r *rowSet) Next() bool {
 
 		resp, err := r.client.Fetch(r.ctx, r.handle, false, 1000000)
 		if err != nil {
-			log.Printf("FetchResults failed: %v\n", err)
+			if !strings.Contains(err.Error(), "Cancelled") && !strings.Contains(err.Error(), "Invalid or unknown") {
+				log.Printf("FetchResults failed: %v\n", err)
+			}
 			return false
 		}
 		r.hasMore = resp.HasMore
@@ -197,7 +199,7 @@ func (r *rowSet) Scan(dest ...interface{}) error {
 			*dt = int(i)
 		case *int64:
 			i, _ := strconv.ParseInt(val, 10, 0)
-			*dt = int64(i)
+			*dt = i
 		case *int32:
 			i, _ := strconv.ParseInt(val, 10, 0)
 			*dt = int32(i)
@@ -315,10 +317,6 @@ func (r *rowSet) Cancel() error {
 		return err
 	}
 
-	err = con.client.Close(context.Background(), r.handle)
-	if err != nil {
-		return err
-	}
 	//log.Println(status)
-	return nil
+	return con.Close()
 }