From c760030b839591c6913a8cf1243e822f4b328c98 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Thu, 22 Apr 2021 10:38:28 +0300
Subject: [PATCH] fix(sqla): timeseries limit not applied when using columns
 (#14297)

---
 superset/connectors/sqla/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 1d3d5f81b7ef0..a4a1547a5e85c 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -1278,7 +1278,7 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
             is_timeseries  # pylint: disable=too-many-boolean-expressions
             and timeseries_limit
             and not time_groupby_inline
-            and groupby
+            and groupby_exprs_sans_timestamp
         ):
             if db_engine_spec.allows_joins:
                 # some sql dialects require for order by expressions