From ffe30a160aff56e3d1fc0d4efb9bb323c387c4cb Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 11 Apr 2018 17:04:08 +0000
Subject: [PATCH] Fix druid_func tests

---
 superset/assets/src/utils/common.js | 25 +++++++++++++++++++++++++
 superset/connectors/base/models.py  |  2 +-
 superset/connectors/druid/models.py | 12 ++++++++----
 tests/druid_func_tests.py           |  4 ++--
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/superset/assets/src/utils/common.js b/superset/assets/src/utils/common.js
index f2c3bd24ceff7..78942d9cc444c 100644
--- a/superset/assets/src/utils/common.js
+++ b/superset/assets/src/utils/common.js
@@ -103,3 +103,28 @@ export function isTruthy(obj) {
   }
   return !!obj;
 }
+
+export function optionLabel(opt) {
+  if (opt === null) {
+    return '<NULL>';
+  } else if (opt === '') {
+    return '<empty string>';
+  } else if (opt === true) {
+    return '<true>';
+  } else if (opt === false) {
+    return '<false>';
+  }
+  return opt;
+}
+
+export function optionValue(opt) {
+  if (opt === null) {
+    return '<NULL>';
+  }
+  return opt;
+}
+
+export function optionFromValue(opt) {
+  // From a list of options, handles special values & labels
+  return { value: optionValue(opt), label: optionLabel(opt) };
+}
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index 143b75acf2bc5..87c0fc2c63ed7 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -192,7 +192,7 @@ def filter_values_handler(
         def handle_single_value(v):
             # backward compatibility with previous <select> components
             if isinstance(v, basestring):
-                v = v.strip("'").strip('"')
+                v = v.strip().strip("'").strip('"')
                 if target_column_is_numeric:
                     # For backwards compatibility and edge cases
                     # where a column data type might have changed
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 9807855eeb629..c847aca2a0b98 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -1341,18 +1341,22 @@ def increment_timestamp(ts):
 
     @classmethod
     def get_filters(cls, raw_filters, num_cols):  # noqa
+        """Given Superset filter data structure, returns pydruid Filter(s)"""
         filters = None
         for flt in raw_filters:
             col = flt.get('col')
             op = flt.get('op')
             eq = flt.get('val')
-            if not col or not op:
+            if (
+                    not col or
+                    not op or
+                    (eq is None and op not in ('IS NULL', 'IS NOT NULL'))):
                 continue
             cond = None
-            eq = cls.filter_values_handler(
-                eq, is_list_target=op in ('in', 'not in'))
-
             is_numeric_col = col in num_cols
+            eq = cls.filter_values_handler(
+                eq, is_list_target=op in ('in', 'not in'),
+                target_column_is_numeric=is_numeric_col)
             if op == '==':
                 cond = Dimension(col) == eq
             elif op == '!=':
diff --git a/tests/druid_func_tests.py b/tests/druid_func_tests.py
index 9c1bca9aa56d2..b750d3d87367d 100644
--- a/tests/druid_func_tests.py
+++ b/tests/druid_func_tests.py
@@ -122,12 +122,12 @@ def test_get_filters_handles_arrays_for_string_types(self):
 
         filtr = {'col': 'A', 'op': '==', 'val': []}
         res = DruidDatasource.get_filters([filtr], [])
-        self.assertEqual('', res.filter['filter']['value'])
+        self.assertEqual(None, res.filter['filter']['value'])
 
     def test_get_filters_handles_none_for_string_types(self):
         filtr = {'col': 'A', 'op': '==', 'val': None}
         res = DruidDatasource.get_filters([filtr], [])
-        self.assertEqual('', res.filter['filter']['value'])
+        self.assertEqual(None, res)
 
     def test_get_filters_extracts_values_in_quotes(self):
         filtr = {'col': 'A', 'op': 'in', 'val': ['  "a" ']}