Fix explicitly prepared statements with describe statement cache mode

jackc · jackc · commit 7ceeea6fe604 · 2022-04-28T07:58:24.000-05:00
fixes #1196
diff --git a/conn.go b/conn.go
@@ -645,7 +645,7 @@ optionLoop:
 		resultFormats = c.eqb.resultFormats
 	}
 
-	if c.stmtcache != nil && c.stmtcache.Mode() == stmtcache.ModeDescribe {
+	if c.stmtcache != nil && c.stmtcache.Mode() == stmtcache.ModeDescribe && !ok {
 		rows.resultReader = c.pgConn.ExecParams(ctx, sql, c.eqb.paramValues, sd.ParamOIDs, c.eqb.paramFormats, resultFormats)
 	} else {
 		rows.resultReader = c.pgConn.ExecPrepared(ctx, sd.Name, c.eqb.paramValues, c.eqb.paramFormats, resultFormats)
diff --git a/conn_test.go b/conn_test.go
@@ -496,6 +496,50 @@ func TestPrepareIdempotency(t *testing.T) {
 	}
 }
 
+func TestPrepareStatementCacheModes(t *testing.T) {
+	t.Parallel()
+
+	config := mustParseConfig(t, os.Getenv("PGX_TEST_DATABASE"))
+
+	tests := []struct {
+		name                string
+		buildStatementCache pgx.BuildStatementCacheFunc
+	}{
+		{
+			name:                "disabled",
+			buildStatementCache: nil,
+		},
+		{
+			name: "prepare",
+			buildStatementCache: func(conn *pgconn.PgConn) stmtcache.Cache {
+				return stmtcache.New(conn, stmtcache.ModePrepare, 32)
+			},
+		},
+		{
+			name: "describe",
+			buildStatementCache: func(conn *pgconn.PgConn) stmtcache.Cache {
+				return stmtcache.New(conn, stmtcache.ModeDescribe, 32)
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			config.BuildStatementCache = tt.buildStatementCache
+			conn := mustConnect(t, config)
+			defer closeConn(t, conn)
+
+			_, err := conn.Prepare(context.Background(), "test", "select $1::text")
+			require.NoError(t, err)
+
+			var s string
+			err = conn.QueryRow(context.Background(), "test", "hello").Scan(&s)
+			require.NoError(t, err)
+			require.Equal(t, "hello", s)
+		})
+	}
+}
+
 func TestListenNotify(t *testing.T) {
 	t.Parallel()
 

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ optionLoop:`
`645`	`645`	`resultFormats = c.eqb.resultFormats`
`646`	`646`	`}`
`647`	`647`
`648`		`- if c.stmtcache != nil && c.stmtcache.Mode() == stmtcache.ModeDescribe {`
	`648`	`+ if c.stmtcache != nil && c.stmtcache.Mode() == stmtcache.ModeDescribe && !ok {`
`649`	`649`	`rows.resultReader = c.pgConn.ExecParams(ctx, sql, c.eqb.paramValues, sd.ParamOIDs, c.eqb.paramFormats, resultFormats)`
`650`	`650`	`} else {`
`651`	`651`	`rows.resultReader = c.pgConn.ExecPrepared(ctx, sd.Name, c.eqb.paramValues, c.eqb.paramFormats, resultFormats)`