fix: the isNot operator for filtering the date field is adapted for s…

…qlite
teableio · Jun 7, 2024 · a31053b · a31053b
1 parent c2c3ad3
commit a31053b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/apps/nestjs-backend/src/db-provider/filter-query/filter-query.abstract.ts b/apps/nestjs-backend/src/db-provider/filter-query/filter-query.abstract.ts
@@ -181,8 +181,7 @@ export abstract class AbstractFilterQuery implements IFilterQueryInterface {
  private shouldKeepFilterItem(value: unknown, field: IFieldInstance, operator: string): boolean {
  return (
  value !== null ||
- field.type === FieldType.Checkbox ||
- (field.type === FieldType.Formula && field.cellValueType === CellValueType.Boolean) ||
+ field.cellValueType === CellValueType.Boolean ||
  ([isEmpty.value, isNotEmpty.value] as string[]).includes(operator)
  );
  }

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,7 +24,9 @@ export class DatetimeCellValueFilterAdapter extends CellValueFilterSqlite {
  const { options } = this.field;
 
  const dateTimeRange = this.getFilterDateTimeRange(options as IDateFieldOptions, value);
- builderClient.whereNotBetween(this.tableColumnRef, dateTimeRange);
+ builderClient
+ .whereNotBetween(this.tableColumnRef, dateTimeRange)
+ .orWhereNull(this.tableColumnRef);
  return builderClient;
  }