Merge pull request apache#4590 from michellethomas/fixing_double_esca…

…pe_presto

Removing escape_sql so we dont double escape
(cherry picked from commit 4250e23)

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()

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()