diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
commit | 207df6fc406e81bfeebdff7f404bd242ff3f099f (patch) | |
tree | a1a796b056909dd0a04ffec163db9363a8757808 /src/column_namer.cc | |
parent | Releasing progress-linux version 0.11.2-1~progress7.99u1. (diff) | |
download | lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.tar.xz lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.zip |
Merging upstream version 0.12.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/column_namer.cc')
-rw-r--r-- | src/column_namer.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/column_namer.cc b/src/column_namer.cc index ba2d872..8c263c2 100644 --- a/src/column_namer.cc +++ b/src/column_namer.cc @@ -50,7 +50,8 @@ column_namer::existing_name(const string_fragment& in_name) const auto upped = toupper(in_name.to_string()); if (std::binary_search( - std::begin(sql_keywords), std::end(sql_keywords), upped)) { + std::begin(sql_keywords), std::end(sql_keywords), upped)) + { return true; } break; @@ -99,10 +100,13 @@ column_namer::add_column(const string_fragment& in_name) this->cn_name_counters[counter_name] = num; } - log_debug( - "column name already exists: %.*s", retval.length(), retval.data()); fmt::format_to( std::back_inserter(buf), FMT_STRING("{}_{}"), base_name, num); + log_debug("column name already exists (%.*s), trying (%.*s)", + retval.length(), + retval.data(), + buf.size(), + buf.data()); retval = string_fragment::from_memory_buffer(buf); num += 1; } |