You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2022/03/21 10:45:13 UTC
[superset] 01/01: fix bad conflict resolution
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.4
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 4862a429a532c47b6f41eb8f0e843898c75de3cb
Author: Ville Brofeldt <vi...@gmail.com>
AuthorDate: Mon Mar 21 12:43:19 2022 +0200
fix bad conflict resolution
---
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 fe79f81..fce05a5 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -1280,7 +1280,7 @@ class SqlaTable(Model, BaseDatasource): # pylint: disable=too-many-public-metho
msg=ex.message,
)
) from ex
- where_clause_and += [self.text(where)]
+ where_clause_and += [text(where)]
having = extras.get("having")
if having:
try:
@@ -1292,7 +1292,7 @@ class SqlaTable(Model, BaseDatasource): # pylint: disable=too-many-public-metho
msg=ex.message,
)
) from ex
- having_clause_and += [self.text(having)]
+ having_clause_and += [text(having)]
if apply_fetch_values_predicate and self.fetch_values_predicate:
qry = qry.where(self.get_fetch_values_predicate())
if granularity: