From b594c5a03542bbe7d24ce2e4283aaa4eb6db1264 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 14 Apr 2023 17:46:46 +0800 Subject: [PATCH] fix(nocodb): incorrect OR builder --- .../db/sql-data-mapper/lib/sql/functionMappings/pg.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts index 50fd306e94..a8332b01b2 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts @@ -157,11 +157,13 @@ 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}`