fix(nocodb): fix formula queries

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts

@@ -722,37 +722,30 @@ export default async function formulaQueryBuilderv2(
             : 0
         }) ${colAlias}`;
       } else if (
+        knex.clientType() === 'sqlite3' ||
         knex.clientType() === 'pg' ||
-        knex.clientType() === 'sqlite3'
+        knex.clientType() === 'mssql'
       ) {
-        sql = `COALESCE(${left} ${pt.operator} ${right}, ${
-          pt.operator === '='
-            ? pt.left.type === 'Literal'
-              ? pt.left.value === ''
-              : pt.right.value === ''
-            : pt.operator === '!='
-            ? pt.left.type !== 'Literal'
-              ? pt.left.value === ''
-              : pt.right.value === ''
-            : false
-        }) ${colAlias}`;
-      } else if (knex.clientType() === 'mssql') {
         if (pt.operator === '=') {
           if (pt.left.type === 'Literal' && pt.left.value === '') {
-            sql = `${right} IS NULL OR ${right} = ''`;
+            sql = `${right} IS NULL OR CAST(${right} AS TEXT) = ''`;
           } else if (pt.right.type === 'Literal' && pt.right.value === '') {
-            sql = `${left} IS NULL OR ${left} = ''`;
+            sql = `${left} IS NULL OR CAST(${left} AS TEXT) = ''`;
           }
         } else if (pt.operator === '!=') {
           if (pt.left.type === 'Literal' && pt.left.value === '') {
-            sql = `${right} IS NOT NULL AND ${right} != ''`;
+            sql = `${right} IS NOT NULL AND CAST(${right} AS TEXT) != ''`;
           } else if (pt.right.type === 'Literal' && pt.right.value === '') {
-            sql = `${left} IS NOT NULL AND ${left} != ''`;
+            sql = `${left} IS NOT NULL AND CAST(${left} AS TEXT) != ''`;
           }
         }
 
-        if (prevBinaryOp !== 'AND' && prevBinaryOp !== 'OR') {
-          sql = `CASE WHEN ${sql} THEN 1 ELSE 0 END ${colAlias}`;
+        if (
+          (pt.operator === '=' || pt.operator === '!=') &&
+          prevBinaryOp !== 'AND' &&
+          prevBinaryOp !== 'OR'
+        ) {
+          sql = `(CASE WHEN ${sql} THEN true ELSE false END ${colAlias})`;
         } else {
           sql = `${sql} ${colAlias}`;
         }

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts

@@ -114,6 +114,30 @@ const pg = {
       )} % 7 + 7) ::INTEGER % 7 ${colAlias}`
     );
   },
+  AND: (args: MapFnArgs) => {
+    return args.knex.raw(
+      `CASE WHEN ${args.knex
+        .raw(
+          `${args.pt.arguments
+            .map((ar) => args.fn(ar, '', 'AND').toQuery())
+            .join(' AND ')}`
+        )
+        .wrap('(', ')')
+        .toQuery()} THEN 1 ELSE 0 END ${args.colAlias}`
+    );
+  },
+  OR: (args: MapFnArgs) => {
+    return args.knex.raw(
+      `CASE WHEN ${args.knex
+        .raw(
+          `${args.pt.arguments
+            .map((ar) => args.fn(ar, '', 'OR').toQuery())
+            .join(' OR ')}`
+        )
+        .wrap('(', ')')
+        .toQuery()} THEN 1 ELSE 0 END ${args.colAlias}`
+    );
+  },
 };
 
 export default pg;

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts

@@ -152,6 +152,30 @@ const sqlite3 = {
       )} % 7 + 7) % 7 ${colAlias}`
     );
   },
+  AND: (args: MapFnArgs) => {
+    return args.knex.raw(
+      `CASE WHEN ${args.knex
+        .raw(
+          `${args.pt.arguments
+            .map((ar) => args.fn(ar, '', 'AND').toQuery())
+            .join(' AND ')}`
+        )
+        .wrap('(', ')')
+        .toQuery()} THEN 1 ELSE 0 END ${args.colAlias}`
+    );
+  },
+  OR: (args: MapFnArgs) => {
+    return args.knex.raw(
+      `CASE WHEN ${args.knex
+        .raw(
+          `${args.pt.arguments
+            .map((ar) => args.fn(ar, '', 'OR').toQuery())
+            .join(' OR ')}`
+        )
+        .wrap('(', ')')
+        .toQuery()} THEN 1 ELSE 0 END ${args.colAlias}`
+    );
+  },
 };
 
 export default sqlite3;