From f59e8bf5551f403e6b7ec0912097bce85ea21351 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Thu, 27 Apr 2023 21:02:58 -0500
Subject: [PATCH] Fix: RowToStructByPos with embedded unexported struct

https://github.com/jackc/pgx/issues/1583
---
 rows.go      | 12 +++++-------
 rows_test.go | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/rows.go b/rows.go
index fc3a2f34..2363eb7e 100644
--- a/rows.go
+++ b/rows.go
@@ -533,13 +533,11 @@ func (rs *positionalStructRowScanner) appendScanTargets(dstElemValue reflect.Val
 
 	for i := 0; i < dstElemType.NumField(); i++ {
 		sf := dstElemType.Field(i)
-		if sf.PkgPath == "" {
-			// Handle anonymous struct embedding, but do not try to handle embedded pointers.
-			if sf.Anonymous && sf.Type.Kind() == reflect.Struct {
-				scanTargets = rs.appendScanTargets(dstElemValue.Field(i), scanTargets)
-			} else {
-				scanTargets = append(scanTargets, dstElemValue.Field(i).Addr().Interface())
-			}
+		// Handle anonymous struct embedding, but do not try to handle embedded pointers.
+		if sf.Anonymous && sf.Type.Kind() == reflect.Struct {
+			scanTargets = rs.appendScanTargets(dstElemValue.Field(i), scanTargets)
+		} else if sf.PkgPath == "" {
+			scanTargets = append(scanTargets, dstElemValue.Field(i).Addr().Interface())
 		}
 	}
 
diff --git a/rows_test.go b/rows_test.go
index e816818f..e85bacec 100644
--- a/rows_test.go
+++ b/rows_test.go
@@ -411,6 +411,31 @@ func TestRowToStructByPosMultipleEmbeddedStruct(t *testing.T) {
 	})
 }
 
+func TestRowToStructByPosEmbeddedUnexportedStruct(t *testing.T) {
+	type name struct {
+		First string
+		Last  string
+	}
+
+	type person struct {
+		name
+		Age int32
+	}
+
+	defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) {
+		rows, _ := conn.Query(ctx, `select 'John' as first_name, 'Smith' as last_name, n as age from generate_series(0, 9) n`)
+		slice, err := pgx.CollectRows(rows, pgx.RowToStructByPos[person])
+		require.NoError(t, err)
+
+		assert.Len(t, slice, 10)
+		for i := range slice {
+			assert.Equal(t, "John", slice[i].name.First)
+			assert.Equal(t, "Smith", slice[i].name.Last)
+			assert.EqualValues(t, i, slice[i].Age)
+		}
+	})
+}
+
 // Pointer to struct is not supported. But check that we don't panic.
 func TestRowToStructByPosEmbeddedPointerToStruct(t *testing.T) {
 	type Name struct {