[bugfix] text as subquery fails with 'Series Limit' (#1347)

apache · Oct 18, 2016 · 8f29944 · 8f29944
1 parent ecb951b
commit 8f29944
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/caravel/models.py b/caravel/models.py
@@ -988,7 +988,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
@@ -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())