From 2a61396439077302fc931e2aac2834f15b8e511f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 15 Apr 2023 16:53:20 +0800 Subject: [PATCH] fix: incorrect OR builder --- packages/nocodb-nest/src/db/functionMappings/pg.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/nocodb-nest/src/db/functionMappings/pg.ts b/packages/nocodb-nest/src/db/functionMappings/pg.ts index 7337244afe..cfb1aa157e 100644 --- a/packages/nocodb-nest/src/db/functionMappings/pg.ts +++ b/packages/nocodb-nest/src/db/functionMappings/pg.ts @@ -157,14 +157,16 @@ const pg = { builder: args.knex.raw( `CASE WHEN ${args.knex .raw( - `${args.pt.arguments - .map(async (ar) => - (await args.fn(ar, '', 'OR')).builder.toQuery(), + `${( + await Promise.all( + args.pt.arguments.map(async (ar) => + (await args.fn(ar, '', 'OR')).builder.toQuery() + ) ) - .join(' OR ')}`, + ).join(' OR ')}` ) .wrap('(', ')') - .toQuery()} THEN TRUE ELSE FALSE END ${args.colAlias}`, + .toQuery()} THEN TRUE ELSE FALSE END ${args.colAlias}` ), }; },