Added mysql case in cleaner #220
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rishsriv
reviewed
Sep 17, 2024
eval/api_runner.py
Outdated
| # remove extra spaces around brackets especially for MySQL | ||
| query = query.replace(" ( ", "(").replace(" )", ")") | ||
| query = query.replace(" (", "(").replace(") ", ")") | ||
| query = query.replace("( ", "(").replace(" )", ")") |
There was a problem hiding this comment.
Hello! Could we use regex here for cleaner code that handles edge cases better? The code above would fail in some cases. For example, if the query generated is
query = "SELECT SUM ( a ) from table;"The the code above would fail.
However, the code below would work fine.
query = re.sub(r'\s*\(\s*', '(', query) # Remove spaces before and after '('
query = re.sub(r'\s*\)\s*', ') ', query) # Remove spaces before and after ')', and only leaves a single space for syntactic correctnessThere was a problem hiding this comment.
Thanks, fixed- also realized we do not want to remove space after a closing brace because that is valid- eg: COUNT(t.sbTxStatus) , 0) AS success_rate. So, its this now:
# remove extra spaces around brackets especially for MySQL
query = re.sub(r"\s*\(\s*", "(", query) # Remove spaces before and after '('
query = re.sub(r"\s*\)", ")", query) # Remove spaces before ')'
There was a problem hiding this comment.
looks good to me too! thanks for this change
wendy-aw
approved these changes
Sep 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The eval I ran earlier had a lot of errors because of this space before and after
(and).This is something that is completely fine with postgres but erroneous in mysql. We do some post cleaning of the query to make sure we get rid of any such spaces. A case with spaces both before and after a bracket was handled but a more popular case is when there is a space after the bracket. Including this in the
clean_generated_queryfor clarity.