Fix: clear null values from options dictionary

karthikrk1 · Jun 13, 2017 · a824647 · a824647
1 parent ef2eaf1
commit a824647
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/redash/handlers/data_sources.py b/redash/handlers/data_sources.py
@@ -10,6 +10,7 @@
                                 require_permission, view_only)
 from redash.query_runner import (get_configuration_schema_for_query_runner_type,
                                  query_runners)
+from redash.utils import filter_none
 from redash.utils.configuration import ConfigurationContainer, ValidationError
 
 
@@ -35,7 +36,7 @@ def post(self, data_source_id):
             abort(400)
         try:
             data_source.options.set_schema(schema)
-            data_source.options.update(req['options'])
+            data_source.options.update(filter_none(req['options']))
         except ValidationError:
             abort(400)
 
@@ -88,7 +89,9 @@ def post(self):
         if schema is None:
             abort(400)
 
-        config = ConfigurationContainer(req['options'], schema)
+        config = ConfigurationContainer(filter_none(req['options']), schema)
+        # from IPython import embed
+        # embed()
         if not config.is_valid():
             abort(400)
 

diff --git a/redash/utils/__init__.py b/redash/utils/__init__.py
@@ -10,7 +10,7 @@
 import pytz
 import pystache
 
-from funcy import distinct
+from funcy import distinct, select_values
 from sqlalchemy.orm.query import Query
 
 from .human_time import parse_human_time
@@ -165,3 +165,7 @@ def base_url(org):
         return "https://{}/{}".format(settings.HOST, org.slug)
 
     return settings.HOST
+
+
+def filter_none(d):
+    return select_values(lambda v: v is not None, d)
diff --git a/tests/handlers/test_data_sources.py b/tests/handlers/test_data_sources.py
@@ -51,7 +51,7 @@ def setUp(self):
     def test_returns_400_when_configuration_invalid(self):
         admin = self.factory.create_admin()
         rv = self.make_request('post', self.path,
-                               data={'name': 'DS 1', 'type': 'pg', 'options': '{}'}, user=admin)
+                               data={'name': 'DS 1', 'type': 'pg', 'options': {}}, user=admin)
 
         self.assertEqual(rv.status_code, 400)
 
@@ -94,7 +94,7 @@ def test_returns_400_when_missing_fields(self):
     def test_returns_400_when_configuration_invalid(self):
         admin = self.factory.create_admin()
         rv = self.make_request('post', '/api/data_sources',
-                               data={'name': 'DS 1', 'type': 'pg', 'options': '{}'}, user=admin)
+                               data={'name': 'DS 1', 'type': 'pg', 'options': {}}, user=admin)
 
         self.assertEqual(rv.status_code, 400)
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,7 +1,9 @@
-from redash.utils import build_url, collect_query_parameters, collect_parameters_from_request
 from collections import namedtuple
 from unittest import TestCase
 
+from redash.utils import (build_url, collect_parameters_from_request,
+                          collect_query_parameters, filter_none)
+
 DummyRequest = namedtuple('DummyRequest', ['host', 'scheme'])
 
 
@@ -49,3 +51,13 @@ def test_ignores_non_prefixed_values(self):
 
     def test_takes_prefixed_values(self):
         self.assertDictEqual({'test': 1, 'something_else': 'test'}, collect_parameters_from_request({'p_test': 1, 'p_something_else': 'test'}))
+
+
+class TestSkipNones(TestCase):
+    def test_skips_nones(self):
+        d = {
+            'a': 1,
+            'b': None
+        }
+
+        self.assertDictEqual(filter_none(d), {'a': 1})