Skip to content

Fix auto-limit error when limit all is used #5576

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

Open
iwakiriK wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix auto-limit error when limit all is used #5576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions redash/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,19 +216,23 @@ def render_template(path, context):

def query_is_select_no_limit(query):
parsed_query = sqlparse.parse(query)[0]
last_keyword_idx = find_last_keyword_idx(parsed_query)
last_keyword_idx = find_last_keyword_idx(parsed_query.tokens)
penultimate_keyword_idx = find_last_keyword_idx(parsed_query.tokens[:last_keyword_idx])
# Either invalid query or query that is not select
if last_keyword_idx == -1 or parsed_query.tokens[0].value.upper() != "SELECT":
return False

no_limit = parsed_query.tokens[last_keyword_idx].value.upper() != "LIMIT" \
and not (penultimate_keyword_idx != -1 \
and parsed_query.tokens[penultimate_keyword_idx].value.upper() == "LIMIT" \
and parsed_query.tokens[last_keyword_idx].value.upper() == "ALL") \
and parsed_query.tokens[last_keyword_idx].value.upper() != "OFFSET"
return no_limit


def find_last_keyword_idx(parsed_query):
for i in reversed(range(len(parsed_query.tokens))):
if parsed_query.tokens[i].ttype in sqlparse.tokens.Keyword:
def find_last_keyword_idx(parsed_query_tokens):
for i in reversed(range(len(parsed_query_tokens))):
if parsed_query_tokens[i].ttype in sqlparse.tokens.Keyword:
return i
return -1

Expand Down