From 1ff757505e4743813c3eb7cad9e5fce33e1876d5 Mon Sep 17 00:00:00 2001
From: zhangyongding <59941594@qq.com>
Date: Mon, 24 Feb 2025 09:23:50 +0800
Subject: [PATCH 1/2] parseQueryResult and parseWriteResult are modified to
 public interfaces

---
 query.go   | 12 ++++++------
 request.go |  6 ++----
 write.go   |  7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/query.go b/query.go
index 8b88d6f..adde4b8 100644
--- a/query.go
+++ b/query.go
@@ -199,8 +199,11 @@ func (conn *Connection) QueryParameterized(sqlStatements []ParameterizedStatemen
 	return conn.QueryParameterizedContext(context.Background(), sqlStatements)
 }
 
-func (conn *Connection) parseQueryResult(thisResult map[string]interface{}) QueryResult {
-	var qr QueryResult
+func (conn *Connection) ParseQueryResult(thisResult map[string]interface{}) QueryResult {
+	var qr = QueryResult{
+		conn:      conn,
+		rowNumber: -1,
+	}
 
 	// did we get an error?
 	_, ok := thisResult["error"]
@@ -231,8 +234,6 @@ func (conn *Connection) parseQueryResult(thisResult map[string]interface{}) Quer
 		trace("%s: fyi, no values this query", conn.ID)
 	}
 
-	qr.rowNumber = -1
-
 	trace("%s: this result (#col,time) %d %f", conn.ID, len(qr.columns), qr.Timing)
 
 	return qr
@@ -294,8 +295,7 @@ func (conn *Connection) QueryParameterizedContext(ctx context.Context, sqlStatem
 	var errs []error
 	for n, r := range resultsArray {
 		trace("%s: parsing result %d", conn.ID, n)
-		qr := conn.parseQueryResult(r.(map[string]interface{}))
-		qr.conn = conn
+		qr := conn.ParseQueryResult(r.(map[string]interface{}))
 		results = append(results, qr)
 		if qr.Err != nil {
 			errs = append(errs, qr.Err)
diff --git a/request.go b/request.go
index ff34a2f..ff42cd3 100644
--- a/request.go
+++ b/request.go
@@ -147,12 +147,10 @@ func (conn *Connection) RequestParameterizedContext(ctx context.Context, sqlStat
 		_, hasColumns := thisResult["columns"]
 		if hasValues || hasColumns {
 			// Presence of these keys means this is a query result
-			qr := conn.parseQueryResult(thisResult)
-			qr.conn = conn
+			qr := conn.ParseQueryResult(thisResult)
 			thisR.Query = &qr
 		} else {
-			wr := conn.parseWriteResult(thisResult)
-			wr.conn = conn
+			wr := conn.ParseWriteResult(thisResult)
 			thisR.Write = &wr
 		}
 		results = append(results, thisR)
diff --git a/write.go b/write.go
index 8da457f..6a82c17 100644
--- a/write.go
+++ b/write.go
@@ -123,8 +123,8 @@ func (conn *Connection) WriteParameterized(sqlStatements []ParameterizedStatemen
 	return conn.WriteParameterizedContext(context.Background(), sqlStatements)
 }
 
-func (conn *Connection) parseWriteResult(thisResult map[string]interface{}) WriteResult {
-	var wr WriteResult
+func (conn *Connection) ParseWriteResult(thisResult map[string]interface{}) WriteResult {
+	var wr = WriteResult{conn: conn}
 
 	// did we get an error?
 	_, ok := thisResult["error"]
@@ -208,8 +208,7 @@ func (conn *Connection) WriteParameterizedContext(ctx context.Context, sqlStatem
 	var errs []error
 	for n, k := range resultsArray {
 		trace("%s: starting on result %d", conn.ID, n)
-		wr := conn.parseWriteResult(k.(map[string]interface{}))
-		wr.conn = conn
+		wr := conn.ParseWriteResult(k.(map[string]interface{}))
 		results = append(results, wr)
 		if wr.Err != nil {
 			errs = append(errs, wr.Err)

From d27cf11a1e9a30e6b738abac07edffe9eaa414eb Mon Sep 17 00:00:00 2001
From: zhangyongding <59941594@qq.com>
Date: Mon, 24 Feb 2025 20:21:57 +0800
Subject: [PATCH 2/2] restore private interface

---
 query.go   | 4 ++--
 request.go | 4 ++--
 write.go   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/query.go b/query.go
index adde4b8..bce7829 100644
--- a/query.go
+++ b/query.go
@@ -199,7 +199,7 @@ func (conn *Connection) QueryParameterized(sqlStatements []ParameterizedStatemen
 	return conn.QueryParameterizedContext(context.Background(), sqlStatements)
 }
 
-func (conn *Connection) ParseQueryResult(thisResult map[string]interface{}) QueryResult {
+func (conn *Connection) parseQueryResult(thisResult map[string]interface{}) QueryResult {
 	var qr = QueryResult{
 		conn:      conn,
 		rowNumber: -1,
@@ -295,7 +295,7 @@ func (conn *Connection) QueryParameterizedContext(ctx context.Context, sqlStatem
 	var errs []error
 	for n, r := range resultsArray {
 		trace("%s: parsing result %d", conn.ID, n)
-		qr := conn.ParseQueryResult(r.(map[string]interface{}))
+		qr := conn.parseQueryResult(r.(map[string]interface{}))
 		results = append(results, qr)
 		if qr.Err != nil {
 			errs = append(errs, qr.Err)
diff --git a/request.go b/request.go
index ff42cd3..efebb0c 100644
--- a/request.go
+++ b/request.go
@@ -147,10 +147,10 @@ func (conn *Connection) RequestParameterizedContext(ctx context.Context, sqlStat
 		_, hasColumns := thisResult["columns"]
 		if hasValues || hasColumns {
 			// Presence of these keys means this is a query result
-			qr := conn.ParseQueryResult(thisResult)
+			qr := conn.parseQueryResult(thisResult)
 			thisR.Query = &qr
 		} else {
-			wr := conn.ParseWriteResult(thisResult)
+			wr := conn.parseWriteResult(thisResult)
 			thisR.Write = &wr
 		}
 		results = append(results, thisR)
diff --git a/write.go b/write.go
index 6a82c17..d22f67f 100644
--- a/write.go
+++ b/write.go
@@ -123,7 +123,7 @@ func (conn *Connection) WriteParameterized(sqlStatements []ParameterizedStatemen
 	return conn.WriteParameterizedContext(context.Background(), sqlStatements)
 }
 
-func (conn *Connection) ParseWriteResult(thisResult map[string]interface{}) WriteResult {
+func (conn *Connection) parseWriteResult(thisResult map[string]interface{}) WriteResult {
 	var wr = WriteResult{conn: conn}
 
 	// did we get an error?
@@ -208,7 +208,7 @@ func (conn *Connection) WriteParameterizedContext(ctx context.Context, sqlStatem
 	var errs []error
 	for n, k := range resultsArray {
 		trace("%s: starting on result %d", conn.ID, n)
-		wr := conn.ParseWriteResult(k.(map[string]interface{}))
+		wr := conn.parseWriteResult(k.(map[string]interface{}))
 		results = append(results, wr)
 		if wr.Err != nil {
 			errs = append(errs, wr.Err)