Backported fix for CORE-6494 - Inconsistent translation "string->timestamp->string->timestamp" in dialect 1.

asfernandes · asfernandes · commit cd7fb4d2741a · 2021-04-06T17:13:25.000-03:00
diff --git a/src/common/cvt.cpp b/src/common/cvt.cpp
@@ -1933,7 +1933,7 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb)
 		else
 		{
 			// Prior to BLR version 5 timestamps were converted to text in the dd-MMM-yyyy format
-			sprintf(p, "%d-%.3s-%d",
+			sprintf(p, "%2.2d-%.3s-%4.4d",
 					times.tm_mday,
 					FB_LONG_MONTHS_UPPER[times.tm_mon], times.tm_year + 1900);
 		}
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
@@ -7413,13 +7413,13 @@ static unsigned print_item(TEXT** s, const IsqlVar* var, const unsigned length)
 			else
 			{
 				if (setValues.Time_display)
-					sprintf(d, "%2d-%s-%4d %2.2d:%2.2d:%2.2d.%4.4" ULONGFORMAT,
+					sprintf(d, "%2.2d-%s-%4.4d %2.2d:%2.2d:%2.2d.%4.4" ULONGFORMAT,
 							times.tm_mday, alpha_months[times.tm_mon],
 							times.tm_year + 1900, times.tm_hour, times.tm_min,
 							times.tm_sec,
 							((ULONG*) var->value.asChar)[1] % ISC_TIME_SECONDS_PRECISION);
 				else
-					sprintf(d, "%2d-%s-%4d", times.tm_mday,
+					sprintf(d, "%2.2d-%s-%4.4d", times.tm_mday,
 							alpha_months[times.tm_mon], times.tm_year + 1900);
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1933,7 +1933,7 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb)`
`1933`	`1933`	`else`
`1934`	`1934`	`{`
`1935`	`1935`	`// Prior to BLR version 5 timestamps were converted to text in the dd-MMM-yyyy format`
`1936`		`- sprintf(p, "%d-%.3s-%d",`
	`1936`	`+ sprintf(p, "%2.2d-%.3s-%4.4d",`
`1937`	`1937`	`times.tm_mday,`
`1938`	`1938`	`FB_LONG_MONTHS_UPPER[times.tm_mon], times.tm_year + 1900);`
`1939`	`1939`	`}`