Merge pull request #16 from PostHog/fix/describe-flag-timing

EDsCODE · web-flow · commit 6bbb9292d60e · 2025-12-11T11:32:31.000-08:00
Fix described flag set before RowDescription is actually sent
diff --git a/server/conn.go b/server/conn.go
@@ -1068,7 +1068,6 @@ func (c *clientConn) handleDescribe(body []byte) {
 			c.sendError("ERROR", "34000", fmt.Sprintf("portal %q does not exist", name))
 			return
 		}
-		p.described = true
 
 		// For non-SELECT, send NoData
 		upperQuery := strings.ToUpper(strings.TrimSpace(p.stmt.query))
@@ -1105,6 +1104,9 @@ func (c *clientConn) handleDescribe(body []byte) {
 			return
 		}
 
+		// Only mark as described when we actually send RowDescription.
+		// If we sent NoData above, Execute should still send RowDescription.
+		p.described = true
 		c.sendRowDescription(cols, colTypes)
 
 	default:

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,6 @@ func (c *clientConn) handleDescribe(body []byte) {`
`1068`	`1068`	`c.sendError("ERROR", "34000", fmt.Sprintf("portal %q does not exist", name))`
`1069`	`1069`	`return`
`1070`	`1070`	`}`
`1071`		`- p.described = true`
`1072`	`1071`
`1073`	`1072`	`// For non-SELECT, send NoData`
`1074`	`1073`	`upperQuery := strings.ToUpper(strings.TrimSpace(p.stmt.query))`
`@@ -1105,6 +1104,9 @@ func (c *clientConn) handleDescribe(body []byte) {`
`1105`	`1104`	`return`
`1106`	`1105`	`}`
`1107`	`1106`
	`1107`	`+ // Only mark as described when we actually send RowDescription.`
	`1108`	`+ // If we sent NoData above, Execute should still send RowDescription.`
	`1109`	`+ p.described = true`
`1108`	`1110`	`c.sendRowDescription(cols, colTypes)`
`1109`	`1111`
`1110`	`1112`	`default:`