-
Notifications
You must be signed in to change notification settings - Fork 640
fix(frontend): support drop function
without arguments
#9561
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,15 +43,38 @@ pub async fn handle_drop_function( | |
let user_name = &session.auth_context().user_name; | ||
let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name); | ||
|
||
// TODO: argument is not specified, drop the only function with the name | ||
let mut arg_types = vec![]; | ||
for arg in func_desc.args.unwrap_or_default() { | ||
arg_types.push(bind_data_type(&arg.data_type)?); | ||
} | ||
let arg_types = match func_desc.args { | ||
Some(args) => { | ||
let mut arg_types = vec![]; | ||
for arg in args { | ||
arg_types.push(bind_data_type(&arg.data_type)?); | ||
} | ||
Some(arg_types) | ||
} | ||
None => None, | ||
}; | ||
|
||
let function_id = { | ||
let reader = session.env().catalog_reader().read_guard(); | ||
match reader.get_function_by_name_args(db_name, schema_path, &function_name, &arg_types) { | ||
let res = match arg_types { | ||
Some(arg_types) => { | ||
reader.get_function_by_name_args(db_name, schema_path, &function_name, &arg_types) | ||
} | ||
// check if there is only one function if arguments are not specified | ||
None => match reader.get_functions_by_name(db_name, schema_path, &function_name) { | ||
Ok((functions, schema_name)) => { | ||
if functions.len() > 1 { | ||
return Err(ErrorCode::CatalogError(format!("function name {function_name:?} is not unique\nHINT: Specify the argument list to select the function unambiguously.").into()).into()); | ||
} | ||
Ok(( | ||
functions.into_iter().next().expect("no functions"), | ||
schema_name, | ||
)) | ||
} | ||
Err(e) => Err(e), | ||
}, | ||
}; | ||
match res { | ||
Comment on lines
+64
to
+77
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 looks a little spaghetti, but I don't have an immediate idea to improve it 🤪 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. Agree. it's quick-and-dirty. 🤪 |
||
Ok((function, schema_name)) => { | ||
session.check_privilege_for_drop_alter(schema_name, &**function)?; | ||
function.id | ||
|
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
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.
Is this option unnecessary?
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.
I thought it might panic when this function returns a
Some(vec![])
. So I added these lines to prevent it.