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

Jump to bottom

Improve aliases for clickhouse binary #58344

Merged
merged 3 commits into from Dec 30, 2023
Merged

Improve aliases for clickhouse binary #58344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c8b5ed
Add bash completion for ch/chl/chc
azat Dec 29, 2023
9e6cfaf
Interpret ch as clickhouse (instead of clickhouse-local)
azat Dec 29, 2023
d899384
Interpret binary without name as clickhouse-local
azat Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions programs/bash-completion/completions/ch
View file
Open in desktop
@@ -0,0 +1 @@
clickhouse
2 changes: 2 additions & 0 deletions programs/bash-completion/completions/chc
View file
Open in desktop
@@ -0,0 +1,2 @@
[[ -v $_CLICKHOUSE_COMPLETION_LOADED ]] || source "$(dirname "${BASH_SOURCE[0]}")/clickhouse-bootstrap"
_complete_clickhouse_generic chc
2 changes: 2 additions & 0 deletions programs/bash-completion/completions/chl
View file
Open in desktop
@@ -0,0 +1,2 @@
[[ -v $_CLICKHOUSE_COMPLETION_LOADED ]] || source "$(dirname "${BASH_SOURCE[0]}")/clickhouse-bootstrap"
_complete_clickhouse_generic chl
1 change: 1 addition & 0 deletions programs/bash-completion/completions/clickhouse
View file
Open in desktop
Expand Up @@ -31,3 +31,4 @@ function _complete_for_clickhouse_entrypoint_bin()
}

_complete_clickhouse_generic clickhouse _complete_for_clickhouse_entrypoint_bin
_complete_clickhouse_generic ch _complete_for_clickhouse_entrypoint_bin
12 changes: 11 additions & 1 deletion programs/main.cpp
View file
Open in desktop
Expand Up @@ -158,7 +158,6 @@ std::pair<std::string_view, MainFunc> clickhouse_applications[] =
std::pair<std::string_view, std::string_view> clickhouse_short_names[] =
{
#if ENABLE_CLICKHOUSE_LOCAL
{"ch", "local"},
{"chl", "local"},
#endif
#if ENABLE_CLICKHOUSE_CLIENT
Expand Down Expand Up @@ -502,6 +501,17 @@ int main(int argc_, char ** argv_)
}
}

/// Interpret binary without argument or with arguments starts with dash
/// ('-') as clickhouse-local for better usability:
///
/// clickhouse # dumps help
/// clickhouse -q 'select 1' # use local
/// clickhouse # spawn local
/// clickhouse local # spawn local
///
if (main_func == printHelp && !argv.empty() && (argv.size() == 1 || argv[1][0] == '-'))
main_func = mainEntryClickHouseLocal;

return main_func(static_cast<int>(argv.size()), argv.data());
}
#endif