From 503afddf20a5c5c93541d0c37064dcad26489077 Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Tue, 13 Mar 2018 12:19:44 -0700 Subject: [PATCH] Merge pull request #4590 from michellethomas/fixing_double_escape_presto Removing escape_sql so we dont double escape (cherry picked from commit 4250e239a2515be91464c1c0502db5b31ac9ee91) --- superset/connectors/sqla/models.py | 2 -- superset/db_engine_specs.py | 9 --------- 2 files changed, 11 deletions(-) diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py index 3b636e8fa2870..ef8c68ebb33e6 100644 --- a/superset/connectors/sqla/models.py +++ b/superset/connectors/sqla/models.py @@ -432,8 +432,6 @@ def get_from_clause(self, template_processor=None, db_engine_spec=None): from_sql = self.sql if template_processor: from_sql = template_processor.process_template(from_sql) - if db_engine_spec: - from_sql = db_engine_spec.escape_sql(from_sql) from_sql = sqlparse.format(from_sql, strip_comments=True) return TextAsFrom(sa.text(from_sql), []).alias('expr_qry') return self.get_sqla_table() diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py index 4d373dff5a0de..9fc5f445db6bf 100644 --- a/superset/db_engine_specs.py +++ b/superset/db_engine_specs.py @@ -145,11 +145,6 @@ def _allowed_file(filename): BaseEngineSpec.df_to_db(**df_to_db_kwargs) - @classmethod - def escape_sql(cls, sql): - """Escapes the raw SQL""" - return sql - @classmethod def convert_dttm(cls, target_type, dttm): return "'{}'".format(dttm.strftime('%Y-%m-%d %H:%M:%S')) @@ -558,10 +553,6 @@ def adjust_database_uri(cls, uri, selected_schema=None): uri.database = database return uri - @classmethod - def escape_sql(cls, sql): - return re.sub(r'%%|%', '%%', sql) - @classmethod def convert_dttm(cls, target_type, dttm): tt = target_type.upper()