fix: datetime isNot filter (#1158)

teableio · Dec 12, 2024 · 3968cab · 3968cab
1 parent c09f58d
commit 3968cab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/.../postgres/cell-value-filter/multiple-value/multiple-datetime-cell-value-filter.adapter.ts b/.../postgres/cell-value-filter/multiple-value/multiple-datetime-cell-value-filter.adapter.ts
@@ -27,12 +27,15 @@ export class MultipleDatetimeCellValueFilterAdapter extends CellValueFilterPostg
     const { options } = this.field;
 
     const dateTimeRange = this.getFilterDateTimeRange(options as IDateFieldOptions, value);
-    builderClient
-      .whereRaw(
-        `NOT ??::jsonb @\\? '$[*] \\? (@ >= "${dateTimeRange[0]}" && @ <= "${dateTimeRange[1]}")'`,
-        [this.tableColumnRef]
-      )
-      .orWhereNull(this.tableColumnRef);
+    builderClient.where((builder) => {
+      builder
+        .whereRaw(
+          `NOT ??::jsonb @\\? '$[*] \\? (@ >= "${dateTimeRange[0]}" && @ <= "${dateTimeRange[1]}")'`,
+          [this.tableColumnRef]
+        )
+        .orWhereNull(this.tableColumnRef);
+    });
+
     return builderClient;
   }
 

diff --git a/...ilter-query/postgres/cell-value-filter/single-value/datetime-cell-value-filter.adapter.ts b/...ilter-query/postgres/cell-value-filter/single-value/datetime-cell-value-filter.adapter.ts
@@ -24,9 +24,12 @@ export class DatetimeCellValueFilterAdapter extends CellValueFilterPostgres {
     const { options } = this.field;
 
     const dateTimeRange = this.getFilterDateTimeRange(options as IDateFieldOptions, value);
-    builderClient
-      .whereNotBetween(this.tableColumnRef, dateTimeRange)
-      .orWhereNull(this.tableColumnRef);
+
+    // Wrap conditions in a nested `.where()` to ensure proper SQL grouping with parentheses,
+    // generating `WHERE ("data" NOT BETWEEN ... OR "data" IS NULL) AND other_query`.
+    builderClient.where((builder) => {
+      builder.whereNotBetween(this.tableColumnRef, dateTimeRange).orWhereNull(this.tableColumnRef);
+    });
     return builderClient;
   }
 

diff --git a/.../filter-query/sqlite/cell-value-filter/single-value/datetime-cell-value-filter.adapter.ts b/.../filter-query/sqlite/cell-value-filter/single-value/datetime-cell-value-filter.adapter.ts
@@ -24,9 +24,9 @@ export class DatetimeCellValueFilterAdapter extends CellValueFilterSqlite {
     const { options } = this.field;
 
     const dateTimeRange = this.getFilterDateTimeRange(options as IDateFieldOptions, value);
-    builderClient
-      .whereNotBetween(this.tableColumnRef, dateTimeRange)
-      .orWhereNull(this.tableColumnRef);
+    builderClient.where((builder) => {
+      builder.whereNotBetween(this.tableColumnRef, dateTimeRange).orWhereNull(this.tableColumnRef);
+    });
     return builderClient;
   }