Fix ignored SQL where clauses

2016-04-04 16:03:21 -07:00 · 2016-04-04 16:03:21 -07:00 · 9c1af66ba4
parent 2b31ab498b
commit 9c1af66ba4
1 changed files with 2 additions and 0 deletions
--- a/caravel/models.py
+++ b/caravel/models.py
@ -575,6 +575,8 @@ class SqlaTable(Model, Queryable, AuditMixinNullable):
            having_clause_and += [text(extras['having'])]
        if granularity:
            qry = qry.where(and_(*(time_filter + where_clause_and)))
+        else:
+            qry = qry.where(and_(*where_clause_and))
        qry = qry.having(and_(*having_clause_and))
        if groupby:
            qry = qry.order_by(desc(main_metric_expr))