From 39d398385cba287442ecd700b744041e88fbf97d Mon Sep 17 00:00:00 2001 From: Nick Ross Date: Wed, 5 Jul 2023 15:58:25 +0100 Subject: [PATCH] fix: implement new blank/not blank filters (#2693) --- dataworkspace/dataworkspace/apps/datasets/utils.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dataworkspace/dataworkspace/apps/datasets/utils.py b/dataworkspace/dataworkspace/apps/datasets/utils.py index 58201ebdbe..62ab31f754 100644 --- a/dataworkspace/dataworkspace/apps/datasets/utils.py +++ b/dataworkspace/dataworkspace/apps/datasets/utils.py @@ -505,10 +505,6 @@ def build_filtered_dataset_query(inner_query, download_limit, column_config, par f"LOWER(STRING_TO_ARRAY(%({field})s, ',')::text) != LOWER({{}}::TEXT) or {{}} is NULL" ).format(Identifier(field), Identifier(field)) ) - if filter_data["type"] == "blank": - where_clause.append(SQL("{{}} IS NULL").format(Identifier(field))) - if filter_data["type"] == "notBlank": - where_clause.append(SQL("{{}} IS NOT NULL").format(Identifier(field))) elif data_type == "text" and filter_data["type"] == "contains": query_params[field] = f"%{terms[0]}%" @@ -563,11 +559,9 @@ def build_filtered_dataset_query(inner_query, download_limit, column_config, par operator = "<" if filter_data["type"] == "lessThan" else "<=" where_clause.append(SQL(f"{{}} {operator} %({field})s").format(Identifier(field))) elif filter_data["type"] == "blank": - where_clause.append(SQL("COALESCE({{}}::TEXT, '') = ''").format(Identifier(field))) + where_clause.append(SQL("COALESCE({}::TEXT, '') = ''").format(Identifier(field))) elif filter_data["type"] == "notBlank": - where_clause.append( - SQL("COALESCE({{}}::TEXT, '') != ''").format(Identifier(field)) - ) + where_clause.append(SQL("COALESCE({}::TEXT, '') != ''").format(Identifier(field))) if where_clause: where_clause = SQL(" WHERE ") + SQL(" AND ").join(where_clause)