[superset] branch master updated: fix(sqla): allow series limit without subquery support (#16896)

[vi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 3272d1c  fix(sqla): allow series limit without subquery support (#16896)
3272d1c is described below

commit 3272d1c0867fd746f083d2cced692e1603eaf42c
Author: Ville Brofeldt <33...@users.noreply.github.com>
AuthorDate: Wed Sep 29 17:30:41 2021 +0200

    fix(sqla): allow series limit without subquery support (#16896)
---
 superset/connectors/sqla/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 7cebb8b..a27a4a1 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -1292,8 +1292,8 @@ class SqlaTable(Model, BaseDatasource):  # pylint: disable=too-many-public-metho
         if row_offset:
             qry = qry.offset(row_offset)
 
-        if db_engine_spec.allows_subqueries and series_limit and groupby_series_columns:
-            if db_engine_spec.allows_joins:
+        if series_limit and groupby_series_columns:
+            if db_engine_spec.allows_joins and db_engine_spec.allows_subqueries:
                 # some sql dialects require for order by expressions
                 # to also be in the select clause -- others, e.g. vertica,
                 # require a unique inner alias