From cf75a8a1f367e585bc44191415bb45070e44b0ab Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 18 Jun 2024 18:49:59 +0100 Subject: [PATCH] Updating function name. --- packages/server/src/api/controllers/row/ExternalRequest.ts | 4 ++-- packages/server/src/api/controllers/row/utils/sqlUtils.ts | 2 +- packages/server/src/api/controllers/row/utils/utils.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index 4e14ce2799..89ad6c617a 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -30,7 +30,7 @@ import { buildExternalRelationships, buildSqlFieldList, generateIdForRow, - isKnexNoRowReadResponse, + isKnexEmptyReadResponse, isManyToMany, sqlOutputProcessing, } from "./utils" @@ -434,7 +434,7 @@ export class ExternalRequest { }) // this is the response from knex if no rows found const rows: Row[] = - !Array.isArray(response) || isKnexNoRowReadResponse(response) + !Array.isArray(response) || isKnexEmptyReadResponse(response) ? [] : response const storeTo = isManyToMany(field) diff --git a/packages/server/src/api/controllers/row/utils/sqlUtils.ts b/packages/server/src/api/controllers/row/utils/sqlUtils.ts index b236578485..6f7bdc7335 100644 --- a/packages/server/src/api/controllers/row/utils/sqlUtils.ts +++ b/packages/server/src/api/controllers/row/utils/sqlUtils.ts @@ -195,7 +195,7 @@ export function buildSqlFieldList( return fields } -export function isKnexNoRowReadResponse(resp: DatasourcePlusQueryResponse) { +export function isKnexEmptyReadResponse(resp: DatasourcePlusQueryResponse) { return ( !Array.isArray(resp) || resp.length === 0 || diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts index a607a01f16..ae34034221 100644 --- a/packages/server/src/api/controllers/row/utils/utils.ts +++ b/packages/server/src/api/controllers/row/utils/utils.ts @@ -14,7 +14,7 @@ import { processDates, processFormulas, } from "../../../../utilities/rowProcessor" -import { isKnexNoRowReadResponse, updateRelationshipColumns } from "./sqlUtils" +import { isKnexEmptyReadResponse, updateRelationshipColumns } from "./sqlUtils" import { basicProcessing, generateIdForRow, @@ -137,7 +137,7 @@ export async function sqlOutputProcessing( relationships: RelationshipsJson[], opts?: { sqs?: boolean } ): Promise { - if (isKnexNoRowReadResponse(rows)) { + if (isKnexEmptyReadResponse(rows)) { return [] } let finalRows: { [key: string]: Row } = {}