You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@superset.apache.org by GitBox <gi...@apache.org> on 2018/06/27 15:01:40 UTC
[GitHub] john-bodley commented on a change in pull request #5295: [WIP] Fix
sqllab limit regex
john-bodley commented on a change in pull request #5295: [WIP] Fix sqllab limit regex
URL: https://github.com/apache/incubator-superset/pull/5295#discussion_r198528742
##########
File path: superset/db_engine_specs.py
##########
@@ -114,23 +114,31 @@ def get_limit_from_sql(cls, sql):
(?ix) # case insensitive, verbose
\s+ # whitespace
LIMIT\s+(\d+) # LIMIT $ROWS
- ;? # optional semi-colon
- (\s|;)*$ # remove trailing spaces tabs or semicolons
+ .*$ # everything else
""")
matches = limit_pattern.findall(sql)
if matches:
- return int(matches[0][0])
+ return matches[0]
@classmethod
def get_query_without_limit(cls, sql):
- return re.sub(r"""
+ before_limit = re.sub(r"""
(?ix) # case insensitive, verbose
\s+ # whitespace
- LIMIT\s+\d+ # LIMIT $ROWS
- ;? # optional semi-colon
- (\s|;)*$ # remove trailing spaces tabs or semicolons
+ LIMIT\s+(\d+) # LIMIT $ROWS
Review comment:
Can we align the comments?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org