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_r198527953
##########
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"""
Review comment:
You probably should rename the function given the change in return values.
Also can we make these staticmethods.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
