firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 17:23:03 +01:00
Code Issues

Improve error message in the case the of the collation attributes do not have ICU-VERSION - #7169.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-04-21 22:29:44 -03:00
parent cc77d95fb6
commit 674cd26580
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/unicode_util.cpp
View File

@ -2057,11 +2057,24 @@ UnicodeUtil::ICU* UnicodeUtil::Utf16Collation::loadICU(
}
string errorMsg;
errorMsg.printf(
"An ICU library with collation version %s is required but was not found. "
"You may try to install ICU version %s, used to register the collation in this database "
"or look for 'gfix -icu' in Firebird documentation.",
collVersion.c_str(), icuVersion.c_str());
if (icuVersion.isEmpty())
{
errorMsg.printf(
"An ICU library with collation version %s is required but was not found. "
"You may try to install another ICU version which this collation version "
"or look for 'gfix -icu' in Firebird documentation.",
collVersion.c_str());
}
else
{
errorMsg.printf(
"An ICU library with collation version %s is required but was not found. "
"You may try to install ICU version %s, used to register the collation in this database "
"or look for 'gfix -icu' in Firebird documentation.",
collVersion.c_str(), icuVersion.c_str());
}
(Arg::Gds(isc_random) << errorMsg).raise();
}