Skip to content
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

Support tokenize SQL function #24

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Support tokenize SQL function #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c631ef2
Support tokenize SQL function
lu-zhengda Nov 6, 2023
becec45
add unit test to verify tokenize function
lu-zhengda Nov 6, 2023
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
4 changes: 2 additions & 2 deletions normalizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (n *Normalizer) collectMetadata(token *Token, lastToken *Token, statementMe
if n.config.CollectComments && (token.Type == COMMENT || token.Type == MULTILINE_COMMENT) {
// Collect comments
statementMetadata.Comments = append(statementMetadata.Comments, token.Value)
} else if token.Type == IDENT || token.Type == QUOTED_IDENT {
} else if token.Type == IDENT || token.Type == QUOTED_IDENT || token.Type == FUNCTION {
tokenVal := token.Value
if token.Type == QUOTED_IDENT {
// remove all open and close quotes
Expand Down Expand Up @@ -265,7 +265,7 @@ func (n *Normalizer) isObfuscatedValueGroupable(token *Token, lastToken *Token,

func (n *Normalizer) appendWhitespace(lastToken *Token, token *Token, normalizedSQLBuilder *strings.Builder) {
// do not add a space between parentheses if RemoveSpaceBetweenParentheses is true
if n.config.RemoveSpaceBetweenParentheses && (lastToken.Value == "(" || lastToken.Value == "[") {
if n.config.RemoveSpaceBetweenParentheses && (lastToken.Type == FUNCTION || lastToken.Value == "(" || lastToken.Value == "[") {
return
}

Expand Down
4 changes: 2 additions & 2 deletions normalizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,10 +946,10 @@ func TestNormalizerWithoutSpaceBetweenParentheses(t *testing.T) {
}{
{
input: "SELECT count(*) FROM users",
expected: "SELECT count (*) FROM users",
expected: "SELECT count(*) FROM users",
},
{
input: "SELECT * FROM users WHERE id IN(?, ?)",
input: "SELECT * FROM users WHERE id IN (?, ?)",
expected: "SELECT * FROM users WHERE id IN (?)",
},
{
Expand Down
6 changes: 5 additions & 1 deletion sqllexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const (
DOLLAR_QUOTED_STRING // dollar quoted string
POSITIONAL_PARAMETER // numbered parameter
BIND_PARAMETER // bind parameter
FUNCTION // function
UNKNOWN // unknown token
)

Expand Down Expand Up @@ -305,7 +306,10 @@ func (s *Lexer) scanIdentifier(ch rune) Token {
for isLetter(ch) || isDigit(ch) || ch == '.' || ch == '?' || ch == '$' || ch == '#' {
ch = s.nextBy(utf8.RuneLen(ch))
}
// return the token as uppercase so that we can do case insensitive matching
if ch == '(' {
// if the identifier is followed by a (, then it's a function
return Token{FUNCTION, s.src[s.start:s.cursor]}
}
return Token{IDENT, s.src[s.start:s.cursor]}
}

Expand Down
16 changes: 16 additions & 0 deletions sqllexer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,22 @@ func TestLexer(t *testing.T) {
},
lexerOpts: []lexerOption{WithDBMS(DBMSMySQL)},
},
{
name: "Tokenize function",
input: "SELECT count(*) FROM users",
expected: []Token{
{IDENT, "SELECT"},
{WS, " "},
{FUNCTION, "count"},
{PUNCTUATION, "("},
{WILDCARD, "*"},
{PUNCTUATION, ")"},
{WS, " "},
{IDENT, "FROM"},
{WS, " "},
{IDENT, "users"},
},
},
}

for _, tt := range tests {
Expand Down