diff --git a/packages/server/src/sdk/app/rows/search/external.ts b/packages/server/src/sdk/app/rows/search/external.ts index 6c2e16dcc4..b7e9c7c80a 100644 --- a/packages/server/src/sdk/app/rows/search/external.ts +++ b/packages/server/src/sdk/app/rows/search/external.ts @@ -81,12 +81,12 @@ export async function search( paginate: paginateObj as PaginationJson, includeSqlRelationships: IncludeRelationship.INCLUDE, } - const requests: Promise[] = [] - requests.push(handleRequest(Operation.READ, tableId, parameters)) + const queries: Promise[] = [] + queries.push(handleRequest(Operation.READ, tableId, parameters)) if (countRows) { - requests.push(handleRequest(Operation.COUNT, tableId, parameters)) + queries.push(handleRequest(Operation.COUNT, tableId, parameters)) } - const responses = await Promise.all(requests) + const responses = await Promise.all(queries) let rows = responses[0] as Row[] const totalRows = responses[1] ? (responses[1] as number) : undefined diff --git a/packages/server/src/sdk/app/rows/search/sqs.ts b/packages/server/src/sdk/app/rows/search/sqs.ts index a93ae174b0..5b71b3c6f3 100644 --- a/packages/server/src/sdk/app/rows/search/sqs.ts +++ b/packages/server/src/sdk/app/rows/search/sqs.ts @@ -213,7 +213,19 @@ export async function search( } try { - const rows = await runSqlQuery(request, allTables) + const queries: Promise[] = [] + queries.push(runSqlQuery(request, allTables)) + if (options.countRows) { + // get the total count of rows + queries.push( + runSqlQuery(request, allTables, { + countTotalRows: true, + }) + ) + } + const responses = await Promise.all(queries) + let rows = responses[0] as Row[] + const totalRows = responses[1] ? (responses[1] as number) : undefined // process from the format of tableId.column to expected format also // make sure JSON columns corrected @@ -231,14 +243,6 @@ export async function search( nextRow = processed.pop() } - let totalRows: number | undefined - if (options.countRows) { - // get the total count of rows - totalRows = await runSqlQuery(request, allTables, { - countTotalRows: true, - }) - } - // get the rows let finalRows = await outputProcessing(table, processed, { preserveLinks: true,