From 44d25523fa24d5b648dea4cfcc01a8579272fe47 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 1 Jul 2022 14:29:42 +0800
Subject: [PATCH] fix: handle null & not null for filter on bt cells

---
 .../src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
index b6fe2ea109..dc617c2ca1 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
@@ -111,6 +111,17 @@ const parseConditionV2 = async (
           else qbP.whereIn(parentColumn.column_name, selectQb);
         };
       } else if (colOptions.type === RelationTypes.BELONGS_TO) {
+        if (filter.comparison_op === 'null') {
+          return (qb) => {
+            qb.whereNull(childColumn.column_name);
+          };
+        }
+        if (filter.comparison_op === 'notnull') {
+          return (qb) => {
+            qb.whereNotNull(childColumn.column_name);
+          };
+        }
+
         const selectQb = knex(parentModel.table_name).select(
           parentColumn.column_name
         );