Fix ignored SQL where clauses

apache · Apr 4, 2016 · 9c1af66 · 9c1af66
1 parent 2b31ab4
commit 9c1af66
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/caravel/models.py b/caravel/models.py
@@ -575,6 +575,8 @@ def query(  # sqla
             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))