From 9e8871cf406abd1e2b5ec5c11d2b304c479c9ad1 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 21 Dec 2023 09:17:00 +0000
Subject: [PATCH] fix: treat values in AND/OR based on type

---
 .../src/db/functionMappings/commonFns.ts      | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/packages/nocodb/src/db/functionMappings/commonFns.ts b/packages/nocodb/src/db/functionMappings/commonFns.ts
index d5d987c866..d8f1929ac5 100644
--- a/packages/nocodb/src/db/functionMappings/commonFns.ts
+++ b/packages/nocodb/src/db/functionMappings/commonFns.ts
@@ -2,6 +2,31 @@ import { FormulaDataTypes } from 'nocodb-sdk';
 import type { MapFnArgs } from '../mapFunctionName';
 import { NcError } from '~/helpers/catchError';
 
+async function treatArgAsConditionalExp(
+  args: MapFnArgs,
+  argument = args.pt?.arguments?.[0],
+) {
+  const condArg = (await args.fn(argument)).builder.toQuery();
+
+  let cond = condArg;
+
+  switch (argument.dataType as FormulaDataTypes) {
+    case FormulaDataTypes.NUMERIC:
+      cond = `(${condArg}) IS NOT NULL AND (${condArg}) != 0`;
+      break;
+    case FormulaDataTypes.STRING:
+      cond = `(${condArg}) IS NOT NULL AND (${condArg}) != ''`;
+      break;
+    case FormulaDataTypes.BOOLEAN:
+      cond = `(${condArg}) IS NOT NULL AND (${condArg}) != false`;
+      break;
+    case FormulaDataTypes.DATE:
+      cond = `(${condArg}) IS NOT NULL`;
+      break;
+  }
+  return { builder: args.knex.raw(cond) };
+}
+
 export default {
   // todo: handle default case
   SWITCH: async (args: MapFnArgs) => {
@@ -37,24 +62,7 @@ export default {
     };
   },
   IF: async (args: MapFnArgs) => {
-    const condArg = (await args.fn(args.pt.arguments[0])).builder.toQuery();
-
-    let cond = condArg;
-
-    switch (args.pt.arguments[0].dataType as FormulaDataTypes) {
-      case FormulaDataTypes.NUMERIC:
-        cond = `(${condArg}) IS NOT NULL AND (${condArg}) != 0`;
-        break;
-      case FormulaDataTypes.STRING:
-        cond = `(${condArg}) IS NOT NULL AND (${condArg}) != ''`;
-        break;
-      case FormulaDataTypes.BOOLEAN:
-        cond = `(${condArg}) IS NOT NULL AND (${condArg}) != false`;
-        break;
-      case FormulaDataTypes.DATE:
-        cond = `(${condArg}) IS NOT NULL`;
-        break;
-    }
+    const cond = await treatArgAsConditionalExp(args);
 
     let query = args.knex
       .raw(
@@ -80,7 +88,7 @@ export default {
             `${(
               await Promise.all(
                 args.pt.arguments.map(async (ar) =>
-                  (await args.fn(ar)).builder.toQuery(),
+                  (await treatArgAsConditionalExp(args, ar)).builder.toQuery(),
                 ),
               )
             ).join(' AND ')}`,
@@ -98,7 +106,7 @@ export default {
             `${(
               await Promise.all(
                 args.pt.arguments.map(async (ar) =>
-                  (await args.fn(ar)).builder.toQuery(),
+                  (await treatArgAsConditionalExp(args, ar)).builder.toQuery(),
                 ),
               )
             ).join(' OR ')}`,