Merge pull request #190 from devforth/fix-nq-filter

fix: fix nq and eq filters with null value

Author: ivictbor

adminforth/dataConnectors/clickhouse.ts

@@ -180,6 +180,19 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
         let operator = this.OperatorsMap[filter.operator];
         if (filter.operator == AdminForthFilterOperators.IN || filter.operator == AdminForthFilterOperators.NIN) {
           placeholder = `(${filter.value.map((_, j) => `{p$?:${column._underlineType}}`).join(', ')})`;
+        } else if (filter.operator == AdminForthFilterOperators.EQ && filter.value === null) {
+          operator = 'IS';
+          placeholder = 'NULL';
+        } else if (filter.operator == AdminForthFilterOperators.NE) {
+          if (filter.value === null) {
+            operator = 'IS NOT';
+            placeholder = 'NULL';
+          } else {
+            // for not equal, we need to add a null check
+            // because nullish field will not match != value
+            placeholder = `${placeholder} OR ${field} IS NULL)`;
+            field = `(${field}`;
+          }
         }
 
         return `${field} ${operator} ${placeholder}`;
@@ -209,6 +222,12 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
           return [{ 'f': `%${filter.value}%` }];
         } else if (filter.operator == AdminForthFilterOperators.IN || filter.operator == AdminForthFilterOperators.NIN) {
           return [{ 'p': filter.value }];
+        } else if (filter.operator == AdminForthFilterOperators.EQ && filter.value === null) {
+          // there is no param for IS NULL filter
+          return [];
+        } else if (filter.operator == AdminForthFilterOperators.NE && filter.value === null) {
+          // there is no param for IS NOT NULL filter
+          return [];
         } else {
           return [{ 'f': (filter as IAdminForthSingleFilter).value }];
         }

adminforth/dataConnectors/mysql.ts

@@ -192,6 +192,9 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
           placeholder = `${placeholder} OR ${field} IS NULL)`;
           field = `(${field}`;
         }
+      } else if (filter.operator == AdminForthFilterOperators.EQ && filter.value === null) {
+        operator = 'IS';
+        placeholder = 'NULL';
       }
       return `${field} ${operator} ${placeholder}`;
     }
@@ -219,6 +222,10 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
         return [`%${filter.value}%`];
       } else if (filter.operator == AdminForthFilterOperators.IN || filter.operator == AdminForthFilterOperators.NIN) {
         return filter.value;
+      } else if (filter.operator == AdminForthFilterOperators.EQ && (filter as IAdminForthSingleFilter).value === null) {
+        return [];
+      } else if (filter.operator == AdminForthFilterOperators.NE && (filter as IAdminForthSingleFilter).value === null) {
+        return [];
       } else {
         return [(filter as IAdminForthSingleFilter).value];
       }

adminforth/dataConnectors/postgres.ts

@@ -217,6 +217,9 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
                 (filter.operator == AdminForthFilterOperators.ILIKE || filter.operator == AdminForthFilterOperators.LIKE)
             ) {
                 field = `cast("${field}" as text)`
+            } else if (filter.operator == AdminForthFilterOperators.EQ && filter.value === null) {
+                operator = 'IS';
+                placeholder = 'NULL';
             } else {
                 field = `"${field}"`
             }
@@ -247,6 +250,8 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
                 return [`%${filter.value}%`];
             } else if (filter.operator == AdminForthFilterOperators.IN || filter.operator == AdminForthFilterOperators.NIN) {
                 return filter.value;
+            } else if (filter.operator == AdminForthFilterOperators.EQ && filter.value === null) {
+                return [];
             } else {
                 return [(filter as IAdminForthSingleFilter).value];
             }