Resolved bug in parse_function_arg
#1826
Open
Conversation
This file contains hidden or 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
iffyio
reviewed
Apr 29, 2025
src/parser/mod.rs
Outdated
Comment on lines
5205
to
5217
| // It may appear that the first token can be converted into a known | ||
| // type, but this could also be a collision as some types are only | ||
| // present in some dialects and therefore some type reserved keywords | ||
| // may be freely used as argument names in other dialects. | ||
|
|
||
| // To check whether the first token is a name or a type, we need to | ||
| // peek the next token, which if it is another type keyword, then the | ||
| // first token is a name and not a type in itself. | ||
| let potential_tokens = [Token::Eq, Token::RParen, Token::Comma]; | ||
| if !self.peek_keyword(Keyword::DEFAULT) | ||
| && !potential_tokens.contains(&self.peek_token().token) | ||
| { | ||
| name = Some(Ident::new(next_token.to_string())); |
There was a problem hiding this comment.
wondering if something like this work instead?
if let DataType::Custom(n, _) = &data_type {
if let Some(dt) = self.maybe_parse(|parser| parser.parse_data_type())? {
match n.0[0].clone() {
ObjectNamePart::Identifier(ident) => name = Some(ident),
}
data_type = dt;
}
}thinking if so it would closer match the desired goal to parse an optional datatype if the first token is regular identifier
There was a problem hiding this comment.
I can try it out, I wasn't aware of maybe_parse which certainly seems to make it less confusing to read.
There was a problem hiding this comment.
The code you proposed does not work as Int2 (or any analogous such type) does not fall in if let DataType::Custom(n, _) = &data_type {, but other variants. I am trying to update my own version using maybe_parse instead of the keywords check.
There was a problem hiding this comment.
See commit 1801b2a
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.
This pull request resolves the bug described in issue #1825, which was caused by an incorrect implementation of the named argument parsing. It also adds a few tests to verify that the new implementation is correct.
The previous implementation made the incorrect assumption that arguments name cannot have the same name as types, but the set of types that are parsed as types in
sqlparseris a superset of the types that are present in each dialect. Therefore, it is correct syntax to use as argument name for instanceint2for PostgreSQL, while this same argument name would be interpreted as a type elsewhere.I have changed the parsing to determine via a look-ahead whether the name is a type or not.
Best,
Luca