Explain seemingly redundant rows.Close() in CollectOneRow

jackc · jackc · commit 05fe5f8b0528 · 2025-03-21T20:33:32.000-05:00
fixes #2282
diff --git a/rows.go b/rows.go
@@ -473,6 +473,8 @@ func CollectOneRow[T any](rows Rows, fn RowToFunc[T]) (T, error) {
 		return value, err
 	}
 
+	// The defer rows.Close() won't have executed yet. If the query returned more than one row, rows would still be open.
+	// rows.Close() must be called before rows.Err() so we explicitly call it here.
 	rows.Close()
 	return value, rows.Err()
 }

Original file line number	Diff line number	Diff line change
`@@ -473,6 +473,8 @@ func CollectOneRow[T any](rows Rows, fn RowToFunc[T]) (T, error) {`
`473`	`473`	`return value, err`
`474`	`474`	`}`
`475`	`475`
	`476`	`+ // The defer rows.Close() won't have executed yet. If the query returned more than one row, rows would still be open.`
	`477`	`+ // rows.Close() must be called before rows.Err() so we explicitly call it here.`
`476`	`478`	`rows.Close()`
`477`	`479`	`return value, rows.Err()`
`478`	`480`	`}`