From 500c0721d7f2a6b6215129f02a39f100d4f99810 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Fri, 1 Apr 2022 17:54:56 -0500
Subject: [PATCH] Improve error messages for query argument encoding

---
 conn.go          |  4 ++++
 pgtype/pgtype.go | 11 +++++++++--
 query_test.go    |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/conn.go b/conn.go
index eb685645..8ccf5043 100644
--- a/conn.go
+++ b/conn.go
@@ -488,6 +488,7 @@ func (c *Conn) execParamsAndPreparedPrefix(sd *pgconn.StatementDescription, args
 	for i := range args {
 		err := c.eqb.AppendParam(c.typeMap, sd.ParamOIDs[i], args[i])
 		if err != nil {
+			err = fmt.Errorf("failed to encode args[%d]: %v", i, err)
 			return err
 		}
 	}
@@ -739,6 +740,7 @@ optionLoop:
 		for i := range args {
 			err = c.eqb.AppendParam(c.typeMap, sd.ParamOIDs[i], args[i])
 			if err != nil {
+				err = fmt.Errorf("failed to encode args[%d]: %v", i, err)
 				rows.fatal(err)
 				return rows, rows.err
 			}
@@ -895,6 +897,7 @@ func (c *Conn) SendBatch(ctx context.Context, b *Batch) BatchResults {
 				for i := range bi.arguments {
 					err := c.eqb.AppendParam(c.typeMap, sd.ParamOIDs[i], bi.arguments[i])
 					if err != nil {
+						err = fmt.Errorf("failed to encode args[%d]: %v", i, err)
 						return &batchResults{ctx: ctx, conn: c, err: err}
 					}
 				}
@@ -962,6 +965,7 @@ func (c *Conn) SendBatch(ctx context.Context, b *Batch) BatchResults {
 			for i := range bi.arguments {
 				err := c.eqb.AppendParam(c.typeMap, sd.ParamOIDs[i], bi.arguments[i])
 				if err != nil {
+					err = fmt.Errorf("failed to encode args[%d]: %v", i, err)
 					return &batchResults{ctx: ctx, conn: c, err: err}
 				}
 			}
diff --git a/pgtype/pgtype.go b/pgtype/pgtype.go
index 5180e27a..ffc017f8 100644
--- a/pgtype/pgtype.go
+++ b/pgtype/pgtype.go
@@ -1737,7 +1737,14 @@ func (m *Map) Encode(oid uint32, formatCode int16, value interface{}, buf []byte
 			return m.Encode(oid, formatCode, v, buf)
 		}
 
-		return nil, fmt.Errorf("unable to encode %#v into OID %d", value, oid)
+		return nil, fmt.Errorf("unable to encode %#v into format code %d for OID %d", value, formatCode, oid)
 	}
-	return plan.Encode(value, buf)
+
+	newBuf, err = plan.Encode(value, buf)
+	if err != nil {
+		err = fmt.Errorf("unable to encode %#v into format code %d for OID %d: %v", value, formatCode, oid, err)
+		return nil, err
+	}
+
+	return newBuf, nil
 }
diff --git a/query_test.go b/query_test.go
index 1cff72bf..8e9d3ef9 100644
--- a/query_test.go
+++ b/query_test.go
@@ -983,7 +983,7 @@ func TestQueryRowErrors(t *testing.T) {
 		{"select $1::badtype", []interface{}{"Jack"}, []interface{}{&actual.i16}, `type "badtype" does not exist`},
 		{"SYNTAX ERROR", []interface{}{}, []interface{}{&actual.i16}, "SQLSTATE 42601"},
 		{"select $1::text", []interface{}{"Jack"}, []interface{}{&actual.i16}, "cannot scan OID 25 in text format into *int16"},
-		{"select $1::point", []interface{}{int(705)}, []interface{}{&actual.s}, "unable to encode 705 into OID 600"},
+		{"select $1::point", []interface{}{int(705)}, []interface{}{&actual.s}, "unable to encode 705 into format code 1 for OID 600"},
 	}
 
 	for i, tt := range tests {