From 96e890c2d4c5b327b9eb236c0b16742faec0046d Mon Sep 17 00:00:00 2001
From: Vijay Rathore <professional.vijay8492@gmail.com>
Date: Tue, 24 May 2022 07:55:55 +0200
Subject: [PATCH] fix: add btw and nbtw filters (#2129)

Signed-off-by: Vijay Kumar Rathore <professional.vijay8492@gmail.com>
---
 packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts | 6 ++++++
 packages/nocodb/src/lib/noco-models/Filter.ts             | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts
index eca1058825..d72dcea6a8 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts
@@ -284,6 +284,12 @@ const parseConditionV2 = async (
           case 'notnull':
             qb = qb.whereNotNull(customWhereClause || field);
             break;
+          case 'btw':
+            qb = qb.whereBetween(field, val.split(','));
+            break;
+          case 'nbtw':
+            qb = qb.whereNotBetween(field, val.split(','));
+            break;
         }
       };
     }
diff --git a/packages/nocodb/src/lib/noco-models/Filter.ts b/packages/nocodb/src/lib/noco-models/Filter.ts
index b5376e9e18..e31929a2b2 100644
--- a/packages/nocodb/src/lib/noco-models/Filter.ts
+++ b/packages/nocodb/src/lib/noco-models/Filter.ts
@@ -37,7 +37,9 @@ export default class Filter {
     | 'le'
     | 'in'
     | 'isnot'
-    | 'is';
+    | 'is'
+    | 'btw'
+    | 'nbtw';
   value?: string;
 
   logical_op?: string;