Merge cded9ae into 41bc761

kayak · Jan 16, 2020 · ca18b5d · ca18b5d
2 parents 41bc761 + cded9ae
commit ca18b5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/fireant/queries/builder/dimension_choices_query_builder.py b/fireant/queries/builder/dimension_choices_query_builder.py
@@ -157,6 +157,9 @@ def fetch(self, hint=None, force_include=()) -> pd.Series:
             # Ensure that these values are included
             query = query.orderby(include, order=Order.desc)
 
+        # Filter out NULL values from choices
+        query = query.where(dimension_definition.notnull())
+
         # Order by the dimension definition that the choices are for
         query = query.orderby(alias_definition)
 

diff --git a/fireant/tests/queries/test_dimension_choices.py b/fireant/tests/queries/test_dimension_choices.py
@@ -66,6 +66,7 @@ def test_query_choices_for_dataset_with_hint_table(self, mock_fetch_data: Mock):
                                                 [PypikaQueryMatcher('SELECT '
                                                                     '"political_party" "$political_party" '
                                                                     'FROM "politics"."hints" '
+                                                                    'WHERE NOT "political_party" IS NULL '
                                                                     'GROUP BY "$political_party" '
                                                                     'ORDER BY "$political_party"')],
                                                 FieldMatcher(mock_hint_dataset.fields.political_party))
@@ -86,6 +87,7 @@ def test_query_choices_for_field_with_display_hint_table(self,
                                                                     '"candidate_name_display" '
                                                                     '"$candidate_name_display" '
                                                                     'FROM "politics"."hints" '
+                                                                    'WHERE NOT "candidate_name" IS NULL '
                                                                     'GROUP BY "$candidate_name",'
                                                                     '"$candidate_name_display" '
                                                                     'ORDER BY "$candidate_name"')],
@@ -110,6 +112,7 @@ def test_query_choices_for_filters_from_joins(self,
                                                                     'JOIN "locations"."state" ON '
                                                                     '"hints"."state_id"="state"."id" '
                                                                     'WHERE "state"."state_name" IN (\'Texas\') '
+                                                                    'AND NOT "hints"."political_party" IS NULL '
                                                                     'GROUP BY "$political_party" '
                                                                     'ORDER BY "$political_party"')],
                                                 FieldMatcher(mock_hint_dataset.fields.political_party))
@@ -131,6 +134,7 @@ def test_query_choices_for_filters_from_base(self,
                                                                     '"political_party" "$political_party" '
                                                                     'FROM "politics"."hints" '
                                                                     'WHERE "candidate_name" IN (\'Bill Clinton\') '
+                                                                    'AND NOT "political_party" IS NULL '
                                                                     'GROUP BY "$political_party" '
                                                                     'ORDER BY "$political_party"')],
                                                 FieldMatcher(mock_hint_dataset.fields.political_party))
@@ -150,6 +154,7 @@ def test_query_choices_for_case_filter(self,
                                                 [PypikaQueryMatcher('SELECT '
                                                                     '"political_party" "$political_party" '
                                                                     'FROM "politics"."hints" '
+                                                                    'WHERE NOT "political_party" IS NULL '
                                                                     'GROUP BY "$political_party" '
                                                                     'ORDER BY "$political_party"')],
                                                 FieldMatcher(mock_hint_dataset.fields.political_party))
@@ -168,6 +173,7 @@ def test_query_choices_for_join_dimension(self,
                                                 [PypikaQueryMatcher('SELECT '
                                                                     '"district_name" "$district-name" '
                                                                     'FROM "politics"."hints" '
+                                                                    'WHERE NOT "district_name" IS NULL '
                                                                     'GROUP BY "$district-name" '
                                                                     'ORDER BY "$district-name"')],
                                                 FieldMatcher(mock_hint_dataset.fields['district-name']))
@@ -188,6 +194,7 @@ def test_query_choices_for_join_dimension_with_filter_from_base(self,
                                                                     '"district_name" "$district-name" '
                                                                     'FROM "politics"."hints" '
                                                                     'WHERE "candidate_name" IN (\'Bill Clinton\') '
+                                                                    'AND NOT "district_name" IS NULL '
                                                                     'GROUP BY "$district-name" '
                                                                     'ORDER BY "$district-name"')],
                                                 FieldMatcher(mock_hint_dataset.fields['district-name']))
@@ -211,6 +218,7 @@ def test_query_choices_for_join_dimension_with_filter_from_join(self,
                                                                     '"hints"."district_id"="district"."id" '
                                                                     'WHERE "district"."district_name" IN ('
                                                                     '\'Manhattan\') '
+                                                                    'AND NOT "hints"."district_name" IS NULL '
                                                                     'GROUP BY "$district-name" '
                                                                     'ORDER BY "$district-name"')],
                                                 FieldMatcher(mock_hint_dataset.fields['district-name']))
@@ -228,6 +236,7 @@ def test_query_choices_for_field(self, mock_fetch_data: Mock):
                                                 [PypikaQueryMatcher('SELECT '
                                                                     '"political_party" "$political_party" '
                                                                     'FROM "politics"."politician" '
+                                                                    'WHERE NOT "political_party" IS NULL '
                                                                     'GROUP BY "$political_party" '
                                                                     'ORDER BY "$political_party"')],
                                                 FieldMatcher(mock_dataset.fields.political_party))