From 62f0354e64b32ccbdfc8faafafa65b48911704c9 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Thu, 13 Oct 2016 23:41:39 -0700 Subject: [PATCH] [bugfix] text as subquery fails with 'Series Limit' --- caravel/models.py | 2 +- caravel/views.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/caravel/models.py b/caravel/models.py index 00a819989f4f4..e92e70881edbb 100644 --- a/caravel/models.py +++ b/caravel/models.py @@ -981,7 +981,7 @@ def visit_column(element, compiler, **kw): # Supporting arbitrary SQL statements in place of tables if self.sql: - tbl = text('(' + self.sql + ') as expr_qry ') + tbl = TextAsFrom(sqla.text(self.sql), []).alias('expr_qry') if not columns: qry = qry.group_by(*groupby_exprs) diff --git a/caravel/views.py b/caravel/views.py index 54b83885081ee..4f4958def5e82 100755 --- a/caravel/views.py +++ b/caravel/views.py @@ -1849,6 +1849,8 @@ def sqllab_viz(self): 'groupby': dims[0].column_name if dims else '', 'metrics': metrics[0].metric_name if metrics else '', 'metric': metrics[0].metric_name if metrics else '', + 'since': '100 years ago', + 'limit': '0', } params = "&".join([k + '=' + v for k, v in params.items()]) url = '/caravel/explore/table/{table.id}/?{params}'.format(**locals())