ParameterizedQuery: handle the case where a value is null (#4072)

getredash · Aug 15, 2019 · 0e90b89 · 0e90b89
1 parent 2c2f241
commit 0e90b89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/redash/models/parameterized_query.py b/redash/models/parameterized_query.py
@@ -94,7 +94,7 @@ def _is_date(string):
     try:
         parse(string)
         return True
-    except ValueError:
+    except (ValueError, TypeError):
         return False
 
 

diff --git a/tests/models/test_parameterized_query.py b/tests/models/test_parameterized_query.py
@@ -97,6 +97,13 @@ def test_raises_on_invalid_date_parameters(self):
         with pytest.raises(InvalidParameterError):
             query.apply({"bar": "baz"})
 
+    def test_raises_on_none_for_date_parameters(self):
+        schema = [{"name": "bar", "type": "date"}]
+        query = ParameterizedQuery("foo", schema)
+
+        with pytest.raises(InvalidParameterError):
+            query.apply({"bar": None})
+
     def test_validates_date_parameters(self):
         schema = [{"name": "bar", "type": "date"}]
         query = ParameterizedQuery("foo {{bar}}", schema)