This repository has been archived by the owner on Oct 18, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 38
query_analysis: allow CREATE FUNCTION statement #365
Draft
psarna
wants to merge
1
commit into
libsql:main
Choose a base branch
from
psarna:create_function_analysis
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -200,25 +200,44 @@ impl Statement { | |
is_insert, | ||
}) | ||
} | ||
|
||
// Workaround for CREATE FUNCTION. | ||
// FIXME: this should be handled by the parser (or *at least* trimmed + case insensitive) | ||
let is_create_function = s.starts_with("CREATE FUNCTION"); | ||
let mut maybe_create_function_stmt = is_create_function.then(|| { | ||
Ok(Statement { | ||
stmt: s.to_string(), | ||
kind: StmtKind::Other, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is definitely a write |
||
is_iud: false, | ||
is_insert: false, | ||
}) | ||
}); | ||
|
||
// The parser needs to be boxed because it's large, and you don't want it on the stack. | ||
// There's upstream work to make it smaller, but in the meantime the parser should remain | ||
// on the heap: | ||
// - https://github.com/gwenn/lemon-rs/issues/8 | ||
// - https://github.com/gwenn/lemon-rs/pull/19 | ||
let mut parser = Box::new(Parser::new(s.as_bytes())); | ||
std::iter::from_fn(move || match parser.next() { | ||
Ok(Some(cmd)) => Some(parse_inner(s, cmd)), | ||
Ok(None) => None, | ||
Err(sqlite3_parser::lexer::sql::Error::ParserError( | ||
ParserError::SyntaxError { | ||
token_type: _, | ||
found: Some(found), | ||
}, | ||
Some((line, col)), | ||
)) => Some(Err(anyhow::anyhow!( | ||
"syntax error around L{line}:{col}: `{found}`" | ||
))), | ||
Err(e) => Some(Err(e.into())), | ||
std::iter::from_fn(move || { | ||
if is_create_function { | ||
return maybe_create_function_stmt.take(); | ||
} | ||
Comment on lines
+223
to
+225
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is not correct, the string can contain multiple statements |
||
|
||
match parser.next() { | ||
Ok(Some(cmd)) => Some(parse_inner(s, cmd)), | ||
Ok(None) => None, | ||
Err(sqlite3_parser::lexer::sql::Error::ParserError( | ||
ParserError::SyntaxError { | ||
token_type: _, | ||
found: Some(found), | ||
}, | ||
Some((line, col)), | ||
)) => Some(Err(anyhow::anyhow!( | ||
"syntax error around L{line}:{col}: `{found}`" | ||
))), | ||
Err(e) => Some(Err(e.into())), | ||
} | ||
}) | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah this needs to be handled by the parser 100%, trimming and case insensitive won't be enough, there can be an arbitrary number of whitespace between
create
andfunction