Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Document storage version flag in CLI + minor rendering fix #18841

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

Merged
merged 3 commits into from
Sep 3, 2025
+4 −3
Merged

Document storage version flag in CLI + minor rendering fix #18841

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
f555281
Document storage version flag in CLI
Mytherin Sep 2, 2025
a77e6a1
Missing .
Mytherin Sep 2, 2025
577d28c
Fix alignment of shown str
Mytherin Sep 3, 2025
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
2 changes: 1 addition & 1 deletion src/common/box_renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ void BoxRenderer::RenderRowCount(string &row_count_str, string &readable_rows_st
// we still need to render the readable rows/shown strings
// check if we can merge the two onto one row
idx_t combined_shown_length = readable_rows_str.size() + shown_str.size() + 4;
if (combined_shown_length <= total_length) {
if (!readable_rows_str.empty() && !shown_str.empty() && combined_shown_length <= total_length) {
// we can! merge them
ss << config.VERTICAL;
ss << " ";
Expand Down
5 changes: 3 additions & 2 deletions tools/shell/shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4755,6 +4755,7 @@ static const char zOptions[] =
" -s COMMAND run \"COMMAND\" and exit\n"
" -safe enable safe-mode\n"
" -separator SEP set output column separator. Default: '|'\n"
" -storage-version V database storage compatibility version to use. Default: 'v0.10.0'\n"
" -table set output mode to 'table'\n"
" -ui launches a web interface using the ui extension (configurable with .ui_command)\n"
" -unredacted allow printing unredacted secrets\n"
Expand Down Expand Up @@ -4964,12 +4965,12 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv) {
data.openFlags |= DUCKDB_UNSIGNED_EXTENSIONS;
} else if (strcmp(z, "-safe") == 0) {
safe_mode = true;
} else if (strcmp(z, "-storage_version") == 0) {
} else if (strcmp(z, "-storage_version") == 0 || strcmp(z, "-storage-version") == 0) {
auto storage_version = string(cmdline_option_value(argc, argv, ++i));
if (storage_version != "latest") {
utf8_printf(
stderr,
"%s: Error: unknown argument (%s) for '-storage_version', only 'latest' is supported currently\n",
"%s: Error: unknown argument (%s) for '-storage-version', only 'latest' is supported currently\n",
program_name, storage_version.c_str());
} else {
data.openFlags |= DUCKDB_LATEST_STORAGE_VERSION;
Expand Down
Loading