From b6f5cbd15e1a11f13074f1996041fe310961a6d7 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Sat, 16 Jul 2022 17:56:24 -0500
Subject: [PATCH] Add Conn to Rows interface

https://github.com/jackc/pgx/issues/1191
---
 pgxpool/rows.go | 5 +++++
 rows.go         | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/pgxpool/rows.go b/pgxpool/rows.go
index aeb65179..0c0a7382 100644
--- a/pgxpool/rows.go
+++ b/pgxpool/rows.go
@@ -18,6 +18,7 @@ func (errRows) Next() bool                                     { return false }
 func (e errRows) Scan(dest ...any) error                       { return e.err }
 func (e errRows) Values() ([]any, error)                       { return nil, e.err }
 func (e errRows) RawValues() [][]byte                          { return nil }
+func (e errRows) Conn() *pgx.Conn                              { return nil }
 
 type errRow struct {
 	err error
@@ -86,6 +87,10 @@ func (rows *poolRows) RawValues() [][]byte {
 	return rows.r.RawValues()
 }
 
+func (rows *poolRows) Conn() *pgx.Conn {
+	return rows.r.Conn()
+}
+
 type poolRow struct {
 	r   pgx.Row
 	c   *Conn
diff --git a/rows.go b/rows.go
index ca5533d9..c4fd283c 100644
--- a/rows.go
+++ b/rows.go
@@ -55,6 +55,10 @@ type Rows interface {
 	// RawValues returns the unparsed bytes of the row values. The returned data is only valid until the next Next
 	// call or the Rows is closed.
 	RawValues() [][]byte
+
+	// Conn returns the underlying *Conn on which the query was executed. This may return nil if Rows did not come from a
+	// *Conn (e.g. if it was created by RowsFromResultReader)
+	Conn() *Conn
 }
 
 // Row is a convenience wrapper over Rows that is returned by QueryRow.
@@ -310,6 +314,10 @@ func (rows *baseRows) RawValues() [][]byte {
 	return rows.values
 }
 
+func (rows *baseRows) Conn() *Conn {
+	return rows.conn
+}
+
 type ScanArgError struct {
 	ColumnIndex int
 	Err         error