Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Preprocess the where clauses." #2411

Merged
merged 2 commits into from
Mar 14, 2017
Merged

Revert "Preprocess the where clauses." #2411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bb9d2
Revert "Display full name. (#2378)"
bkyryliuk Mar 14, 2017
c231e29
Revert "Preprocess the where clauses. (#2405)"
bkyryliuk Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion superset/connectors/sqla/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ def visit_column(element, compiler, **kw):
)
logging.info(sql)
sql = sqlparse.format(sql, reindent=True)
sql = self.database.db_engine_spec.sql_preprocessor(sql)
return sql

def query(self, query_obj):
Expand Down
8 changes: 6 additions & 2 deletions superset/db_engine_specs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ def extract_error_message(cls, e):
def sql_preprocessor(cls, sql):
"""If the SQL needs to be altered prior to running it

For example db api needs to double `%` characters
For example Presto needs to double `%` characters
"""
return sql.replace('%', '%%')
return sql

@classmethod
def patch(cls):
Expand Down Expand Up @@ -279,6 +279,10 @@ def patch(cls):
from superset.db_engines import presto as patched_presto
presto.Cursor.cancel = patched_presto.cancel

@classmethod
def sql_preprocessor(cls, sql):
return sql.replace('%', '%%')

@classmethod
def convert_dttm(cls, target_type, dttm):
tt = target_type.upper()
Expand Down