Skip to content

Unify cursor row data fields setup with other query paths #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fox0430 merged 1 commit into from
Apr 23, 2026
Merged

Unify cursor row data fields setup with other query paths #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions async_postgres/pg_client.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3122,6 +3122,7 @@ proc openCursorImpl(
of bmkRowDescription:
cursor.fields = msg.fields
cursor.bufferedData = newRowData(int16(msg.fields.len))
cursor.bufferedData.fields = cursor.fields
of bmkNoData:
discard
of bmkPortalSuspended:
Expand Down Expand Up @@ -3193,6 +3194,7 @@ proc fetchNextImpl(
): Future[seq[Row]] {.async.} =
let conn = cursor.conn
let rd = newRowData(int16(cursor.fields.len))
rd.fields = cursor.fields
var rowCount: int32 = 0

conn.sendBuf.setLen(0)
Expand Down Expand Up @@ -3245,8 +3247,6 @@ proc fetchNextImpl(
discard
await conn.fillRecvBuf(timeout)

if rd != nil and cursor.fields.len > 0 and rd.fields.len == 0:
rd.fields = cursor.fields
result = newSeq[Row](rowCount)
for i in 0 ..< rowCount:
result[i] = initRow(rd, i)
Expand All @@ -3256,8 +3256,6 @@ proc fetchNext*(cursor: Cursor): Future[seq[Row]] {.async.} =
## Returns an empty seq when the cursor is exhausted.
## On timeout, the connection is marked csClosed (protocol out of sync).
if cursor.bufferedCount > 0:
if cursor.fields.len > 0 and cursor.bufferedData.fields.len == 0:
cursor.bufferedData.fields = cursor.fields
result = newSeq[Row](cursor.bufferedCount)
for i in 0 ..< cursor.bufferedCount:
result[i] = initRow(cursor.bufferedData, i)
Expand Down