Parse params with trailing commas

apache · Dec 15, 2016 · e174406 · e174406
1 parent a708a5e
commit e174406
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/superset/models.py b/superset/models.py
@@ -122,7 +122,9 @@ def alter_params(self, **kwargs):
     @property
     def params_dict(self):
         if self.params:
-            return json.loads(self.params)
+            params = re.sub(",[ \t\r\n]+}", "}", self.params)
+            params = re.sub(",[ \t\r\n]+\]", "]", params)
+            return json.loads(params)
         else:
             return {}
 

diff --git a/superset/source_registry.py b/superset/source_registry.py
@@ -36,7 +36,10 @@ def get_datasource_by_name(cls, session, datasource_type, datasource_name,
                                schema, database_name):
         datasource_class = SourceRegistry.sources[datasource_type]
         datasources = session.query(datasource_class).all()
-        db_ds = [d for d in datasources if d.database.name == database_name and
+
+        # Filter datasoures that don't have database.
+        db_ds = [d for d in datasources if d.database and
+                 d.database.name == database_name and
                  d.name == datasource_name and schema == schema]
         return db_ds[0]
 

diff --git a/tests/import_export_tests.py b/tests/import_export_tests.py
@@ -55,6 +55,11 @@ def create_slice(self, name, ds_id=None, id=None, db_name='main',
             'datasource_name': table_name,
             'database_name': db_name,
             'schema': '',
+            # Test for trailing commas
+            "metrics": [
+                "sum__signup_attempt_email",
+                "sum__signup_attempt_facebook",
+            ],
         }
 
         if table_name and not ds_id: