From 6b2eb04a73a475b1d597076b15bc39c5e0156842 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 1 Feb 2017 16:53:26 -0800 Subject: [PATCH] Put back a default count * metric (#2091) --- superset/models.py | 7 ------- superset/viz.py | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/superset/models.py b/superset/models.py index 9a4d18121..81e251d6b 100644 --- a/superset/models.py +++ b/superset/models.py @@ -1320,15 +1320,8 @@ class SqlaTable(Model, Queryable, AuditMixinNullable, ImportMixin): for s in columns: select_exprs.append(cols[s].sqla_col) metrics_exprs = [] - elif not is_timeseries: - # use all columns if none were specified - for col_obj in cols.values(): - select_exprs.append(col_obj.sqla_col) - metrics_exprs = [] - row_limit = row_limit or 100 if granularity: - @compiles(ColumnClause) def visit_column(element, compiler, **kw): """Patch for sqlalchemy bug diff --git a/superset/viz.py b/superset/viz.py index 1fe04a75f..eaf5a6374 100755 --- a/superset/viz.py +++ b/superset/viz.py @@ -269,7 +269,7 @@ class BaseViz(object): """Building a query object""" form_data = self.form_data groupby = form_data.get("groupby") or [] - metrics = form_data.get("metrics") or [] + metrics = form_data.get("metrics") or ['count'] extra_filters = self.get_extra_filters() granularity = ( form_data.get("granularity") or form_data.get("granularity_sqla")