Skip to content

refactor(cast format): Improve error message about invalid format #9093

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

Open
TreeHunter9 wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

refactor(cast format): Improve error message about invalid format #9093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion src/common/CvtFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,18 @@ namespace

const Format::Patterns pattern = mapFormatStrToFormatPattern(patternStr);
if (pattern == Format::NONE)
invalidPatternException(patternStr, cb);
{
// An invalid `patternStr` may be incomplete, so just parse it from the beginning up to the separator.
// Since patterns can be combined without separators, we can print multiple patterns, but it's fine.
const FB_SIZE_T patternBeginPos = i - patternStr.length();
for (; i < formatLength; i++)
{
if (isSeparator(formatUpper[i]))
break;
}
std::string_view errorPattern(formatUpper.data() + patternBeginPos, i - patternBeginPos);
invalidPatternException(errorPattern, cb);
}
if (outFormatPatterns & pattern)
cb->err(Arg::Gds(isc_can_not_use_same_pattern_twice) << patternStr);
if (!patternIsCompatibleWithDscType(desc, pattern))
Expand Down
Loading