proper NULL casing

smart-on-fhir · Oct 15, 2024 · 4dee383 · 4dee383
1 parent f514144
commit 4dee383
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/handlers/dashboard/get_chart_data.py b/src/handlers/dashboard/get_chart_data.py
@@ -64,7 +64,7 @@ def _build_query(query_params: dict, filters: list, path_params: dict) -> str:
     if len(columns) > 0:
         coalesce_str = (
             f"WHERE COALESCE (cast({' AS VARCHAR), cast('.join(columns)} AS VARCHAR)) "
-            "IS NOT Null AND"
+            "IS NOT NULL AND"
         )
     else:
         coalesce_str = "WHERE"

diff --git a/tests/dashboard/test_get_chart_data.py b/tests/dashboard/test_get_chart_data.py
@@ -36,23 +36,23 @@ def mock_data_frame(filter_param):
             [],
             {"data_package_id": "test_study"},
             f'SELECT gender, sum(cnt) as cnt FROM "{TEST_GLUE_DB}"."test_study" '
-            "WHERE COALESCE (cast(race AS VARCHAR)) IS NOT Null AND gender IS NOT Null  "
+            "WHERE COALESCE (cast(race AS VARCHAR)) IS NOT NULL AND gender IS NOT NULL  "
             "GROUP BY gender ORDER BY gender",
         ),
         (
             {"column": "gender", "stratifier": "race"},
             [],
             {"data_package_id": "test_study"},
             f'SELECT race, gender, sum(cnt) as cnt FROM "{TEST_GLUE_DB}"."test_study" '
-            "WHERE gender IS NOT Null  "
+            "WHERE gender IS NOT NULL  "
             "GROUP BY race, gender ORDER BY race, gender",
         ),
         (
             {"column": "gender"},
             ["gender:strEq:female"],
             {"data_package_id": "test_study"},
             f'SELECT gender, sum(cnt) as cnt FROM "{TEST_GLUE_DB}"."test_study" '
-            "WHERE COALESCE (cast(race AS VARCHAR)) IS NOT Null AND gender IS NOT Null "
+            "WHERE COALESCE (cast(race AS VARCHAR)) IS NOT Null AND gender IS NOT NULL "
             "AND gender LIKE 'female' "
             "GROUP BY gender ORDER BY gender",
         ),
@@ -61,7 +61,7 @@ def mock_data_frame(filter_param):
             ["gender:strEq:female"],
             {"data_package_id": "test_study"},
             f'SELECT race, gender, sum(cnt) as cnt FROM "{TEST_GLUE_DB}"."test_study" '
-            "WHERE gender IS NOT Null "
+            "WHERE gender IS NOT NULL "
             "AND gender LIKE 'female' "
             "GROUP BY race, gender ORDER BY race, gender",
         ),