Parser fix, only allow ORDER BY ASC and ORDER BY time ASC #3409
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
|
+1 |
| return nil, errors.New("only ORDER BY time ASC supported at this time") | ||
| } | ||
| return append(fields, &SortField{Ascending: (tok == ASC)}), nil | ||
| } else if tok != IDENT && tok != STRING { |
There was a problem hiding this comment.
Should only accept IDENT. ORDER BY "foo" ASC is okay but not ORDER BY 'foo' ASC.
| if tok != IDENT && tok != STRING { | ||
| return nil, newParseError(tokstr(tok, lit), []string{"identifier"}, pos) | ||
| } | ||
| field.Name = lit |
There was a problem hiding this comment.
The // Scan for IDENT... line through field.Name = lit should be changed to...
// Parse field name
ident, err := p.parseIdent()
if err != nil {
return nil, err
}
field.Name = ident
|
@dgnorton made the |
|
+1 |
gunnaraasen
added a commit
that referenced
this pull request
Jul 21, 2015
Parser fix, only allow ORDER BY ASC and ORDER BY time ASC
Closed
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.
Fixes #3380, which was introduced in #2912, which itself was a fix for #2731.
This PR makes the parser accept
ORDER BY ASCandORDER BY time ASCas the only validORDER BYclauses. All otherORDER BYclauses will return an error.This also adds some parsing logic for
ORDER BYclauses and fixesSortField.String()to output correctly so the query can be rewritten correctly in therewriteSelectStatementstep of the query executor.