Skip to content

fix(cast format): Correct behavior of YEAR pattern #9052

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 3 commits into
base: master
Choose a base branch
from
+208 −56
Open

fix(cast format): Correct behavior of YEAR pattern #9052

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
9d5b852
refactor(cast format): Use correct name for variables that holds patt…
Jun 5, 2026
8104d5c
fix(cast format): Correct behavior of YEAR pattern
Jun 5, 2026
f0ba472
fix(cast format): Update existing tests and add new ones for the reim…
Jun 5, 2026
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
9 changes: 4 additions & 5 deletions doc/sql.extensions/README.cast.format.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ The following patterns are currently implemented for datetime to string conversi

| Format Pattern | Description |
| -------------- | ----------- |
| YEAR | Year (1 - 9999) |
| YYYY | Last 4 digits of Year (0001 - 9999) |
| YYY | Last 3 digits of Year (000 - 999) |
| YY | Last 2 digits of Year (00 - 99) |
| Y | Last 1 digits of Year (0 - 9) |
| YEAR | Spelled out Year (TWENTY TWENTY-SIX) |
| Q | Quarter of the Year (1 - 4) |
| MM | Month (01 - 12) |
| MON | Short Month name (Apr) |
Expand Down Expand Up @@ -47,7 +47,7 @@ The separators are:

Patterns can be used without any separators:
```
SELECT CAST(CURRENT_TIMESTAMP AS VARCHAR(50) FORMAT 'YEARMMDD HH24MISS') FROM RDB$DATABASE;
SELECT CAST(CURRENT_TIMESTAMP AS VARCHAR(50) FORMAT 'YYYYMMDD HH24MISS') FROM RDB$DATABASE;
=========================
20230719 161757
```
Expand All @@ -58,7 +58,7 @@ Also the format is case-insensitive, so `YYYY-MM` == `yyyy-mm`.

Example:
```
SELECT CAST(CURRENT_TIMESTAMP AS VARCHAR(45) FORMAT 'DD.MM.YEAR HH24:MI:SS "is" J "Julian day"') FROM RDB$DATABASE;
SELECT CAST(CURRENT_TIMESTAMP AS VARCHAR(45) FORMAT 'DD.MM.YYYY HH24:MI:SS "is" J "Julian day"') FROM RDB$DATABASE;
=========================
14.06.2023 15:41:29 is 2460110 Julian day
```
Expand All @@ -69,7 +69,6 @@ The following patterns are currently implemented for string to datetime conversi

| Format Pattern | Description |
| ------------- | ------------- |
| YEAR | Year |
| YYYY | Last 4 digits of Year |
| YYY | Last 3 digits of Year |
| YY | Last 2 digits of Year |
Expand Down Expand Up @@ -109,7 +108,7 @@ Behavior of `RRRR`: Accepts either 4-digit or 2-digit input. If 2-digit, provide

Example:
```
SELECT CAST('2000.12.08 12:35:30.5000' AS TIMESTAMP FORMAT 'YEAR.MM.DD HH24:MI:SS.FF4') FROM RDB$DATABASE;
SELECT CAST('2000.12.08 12:35:30.5000' AS TIMESTAMP FORMAT 'YYYY.MM.DD HH24:MI:SS.FF4') FROM RDB$DATABASE;
=====================
2000-12-08 12:35:30.5000
```
155 changes: 130 additions & 25 deletions src/common/CvtFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,17 @@ namespace
#undef CVT_FORMAT2
#undef CVT_FORMAT_FLAG

constexpr const char* const TO_DATETIME_PATTERNS[] = {
FormatStr::YEAR, FormatStr::YYYY, FormatStr::YYY, FormatStr::YY, FormatStr::Y, FormatStr::Q, FormatStr::MM,
constexpr const char* const TO_STRING_PATTERNS[] = {
FormatStr::YYYY, FormatStr::YYY, FormatStr::YY, FormatStr::Y, FormatStr::YEAR, FormatStr::Q, FormatStr::MM,
FormatStr::MON, FormatStr::MONTH, FormatStr::RM, FormatStr::WW, FormatStr::W, FormatStr::D, FormatStr::DAY,
FormatStr::DD, FormatStr::DDD, FormatStr::DY, FormatStr::J, FormatStr::HH, FormatStr::HH12, FormatStr::HH24,
FormatStr::MI, FormatStr::SS, FormatStr::SSSSS, FormatStr::FF1, FormatStr::FF2, FormatStr::FF3, FormatStr::FF4,
FormatStr::FF5, FormatStr::FF6, FormatStr::FF7, FormatStr::FF8, FormatStr::FF9, FormatStr::TZH, FormatStr::TZM,
FormatStr::TZR, FormatStr::AM, FormatStr::PM
};

constexpr const char* const TO_STRING_PATTERNS[] = {
FormatStr::YEAR, FormatStr::YYYY, FormatStr::YYY, FormatStr::YY, FormatStr::Y, FormatStr::RRRR, FormatStr::RR,
constexpr const char* const TO_DATETIME_PATTERNS[] = {
FormatStr::YYYY, FormatStr::YYY, FormatStr::YY, FormatStr::Y, FormatStr::RRRR, FormatStr::RR,
FormatStr::MM, FormatStr::MON, FormatStr::MONTH, FormatStr::RM, FormatStr::DD, FormatStr::J, FormatStr::HH,
FormatStr::HH12, FormatStr::HH24, FormatStr::MI, FormatStr::SS, FormatStr::SSSSS, FormatStr::FF1, FormatStr::FF2,
FormatStr::FF3, FormatStr::FF4, FormatStr::TZH, FormatStr::TZM, FormatStr::TZR, FormatStr::AM, FormatStr::PM
Expand Down Expand Up @@ -606,7 +606,7 @@ namespace
continue;
}

std::string_view patternStr = getPatternFromFormat(formatUpper.c_str(), TO_DATETIME_PATTERNS, formatLength,
std::string_view patternStr = getPatternFromFormat(formatUpper.c_str(), TO_STRING_PATTERNS, formatLength,
formatOffset, i);

const Format::Patterns pattern = mapFormatStrToFormatPattern(patternStr);
Expand Down Expand Up @@ -716,6 +716,122 @@ namespace
return string(timezoneBuffer, length);
}

string yearToWords(unsigned year, Callbacks* cb)
{
static constexpr const char* ZERO = "ZERO";
static constexpr const char* ONES[] = {
"", "ONE", "TWO", "THREE", "FOUR", "FIVE",
"SIX", "SEVEN", "EIGHT", "NINE", "TEN",
"ELEVEN", "TWELVE", "THIRTEEN", "FOURTEEN", "FIFTEEN",
"SIXTEEN", "SEVENTEEN", "EIGHTEEN", "NINETEEN"
};
static constexpr const char* TENS[] = {
"", "", "TWENTY", "THIRTY", "FORTY", "FIFTY",
"SIXTY", "SEVENTY", "EIGHTY", "NINETY"
};

auto twoDigits = [&](unsigned n, string& result) -> void
{
fb_assert(n < 100);

if (n == 0)
{
result += ZERO;
return;
}
if (n < 20)
{
result += ONES[n];
return;
}

result += TENS[n / 10];
if (n % 10)
{
result += "-";
result += ONES[n % 10];
}
};

// Not possible in our date implementation, but anyway handle 0 value just in case.
if (year == 0)
return ZERO;

string result;
result.reserve(30);

if (year < 100)
{
twoDigits(year, result);
}
else if (year < 1000)
{
const unsigned hi = year / 100;
const unsigned lo = year % 100;
result = ONES[hi];
if (lo < 10)
{
// 900 -> "nine hundred"
result += " HUNDRED";
if (lo != 0)
{
// 905 -> "nine hundred five"
result += " ";
result += ONES[lo];
}
}
else
{
// 925 -> "nine twenty-five"
result += " ";
twoDigits(lo, result);
}
}
else if (year < 10000)
{
const unsigned hi = year / 100;
const unsigned lo = year % 100;
if (lo < 10)
{
const unsigned hihi = hi / 10;
const unsigned hilo = hi % 10;
// 1000 -> "one thousand"
result += ONES[hihi];
result += " THOUSAND";
if (hilo != 0)
{
// 1900 -> "one thousand nine hundred"
result += " ";
result += ONES[hilo];
result += " HUNDRED";
}
if (lo != 0)
{
// 1905 -> "one thousand nine hundred five"
result += " ";
result += ONES[lo];
}
}
else
{
// 1985 -> "nineteen eighty-five"
// 2685 -> "twenty-six eighty-five"
twoDigits(hi, result);
result += " ";
twoDigits(lo, result);
}
}
else
{
// Currently we don't support dates >9999
fb_assert(false);
cb->err(Arg::Gds(isc_value_for_pattern_is_out_of_range)
<< FormatStr::YEAR << Arg::Num(1) << Arg::Num(9999));
}

return result;
}

string processDateTimeToStringTokens(const dsc* desc, const std::vector<Token>& tokens, const struct tm& times, int fractions, Callbacks* cb)
{
string result;
Expand All @@ -740,8 +856,11 @@ namespace
patternResult.printf("%04d", (times.tm_year + 1900) % 10000);
break;
case Format::YEAR:
patternResult.printf("%d", (times.tm_year + 1900));
{
const string year = yearToWords(times.tm_year + 1900, cb);
patternResult.printf("%s", year.data());
break;
}

case Format::Q:
{
Expand Down Expand Up @@ -976,7 +1095,7 @@ namespace
if (i == formatLength)
break;

std::string_view patternStr = getPatternFromFormat(formatUpper.c_str(), TO_STRING_PATTERNS, formatLength,
std::string_view patternStr = getPatternFromFormat(formatUpper.c_str(), TO_DATETIME_PATTERNS, formatLength,
formatOffset, i);

const Format::Patterns pattern = mapFormatStrToFormatPattern(patternStr);
Expand All @@ -1001,18 +1120,17 @@ namespace
constexpr void validateFormatFlags(Format::Patterns formatFlags, Callbacks* cb)
{
// CT shall contain at most one of each of the following: <datetime template year>
if (Format::Patterns value = formatFlags & (Format::Y | Format::YY | Format::YYY | Format::YYYY | Format::YEAR))
if (Format::Patterns value = formatFlags & (Format::Y | Format::YY | Format::YYY | Format::YYYY))
{
switch (value)
{
case Format::Y:
case Format::YY:
case Format::YYY:
case Format::YYYY:
case Format::YEAR:
break;
default:
cb->err(Arg::Gds(isc_only_one_pattern_can_be_used) << Arg::Str("Y/YY/YYY/YYYY/YEAR"));
cb->err(Arg::Gds(isc_only_one_pattern_can_be_used) << Arg::Str("Y/YY/YYY/YYYY"));
}
}

Expand All @@ -1021,8 +1139,8 @@ namespace
cb->err(Arg::Gds(isc_only_one_pattern_can_be_used) << Arg::Str("RR/RRRR"));

// CT shall not contain both <datetime template year> and <datetime template rounded year>
if ((formatFlags & (Format::Y | Format::YY | Format::YYY | Format::YYYY | Format::YEAR)) && (formatFlags & (Format::RR | Format::RRRR)))
cb->err(Arg::Gds(isc_incompatible_format_patterns) << Arg::Str("Y/YY/YYY/YYYY/YEAR") << Arg::Str("RR/RRRR"));
if ((formatFlags & (Format::Y | Format::YY | Format::YYY | Format::YYYY)) && (formatFlags & (Format::RR | Format::RRRR)))
cb->err(Arg::Gds(isc_incompatible_format_patterns) << Arg::Str("Y/YY/YYY/YYYY") << Arg::Str("RR/RRRR"));

// If CT contains <datetime template day of year>, then CT shall not contain <datetime template month>
// or <datetime template day of month>.
Expand Down Expand Up @@ -1392,19 +1510,6 @@ namespace
outTimes.tm_year = year.value() - 1900;
break;
}
case Format::YEAR:
{
const std::optional<int> year = getIntFromString(str, strLength, strOffset, strLength - strOffset);
throwExceptionOnEmptyValue(year, patternStr, cb);

if (year > 9999)
{
cb->err(Arg::Gds(isc_value_for_pattern_is_out_of_range) << patternStr <<
Arg::Num(0) << Arg::Num(9999));
}
outTimes.tm_year = year.value() - 1900;
break;
}
case Format::MI:
{
const std::optional<int> minutes = getIntFromString(str, strLength, strOffset, 2);
Expand Down
Loading
Loading