Fixed CORE-6494 - Inconsistent translation "string->timestamp->string->timestamp" in dialect 1.

asfernandes · asfernandes · commit 90f1c276b1ea · 2021-04-06T16:40:46.000-03:00
diff --git a/src/common/cvt.cpp b/src/common/cvt.cpp
@@ -2232,7 +2232,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
@@ -7759,13 +7759,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,
 								fractions);
 					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
`@@ -2232,7 +2232,7 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb)`
`2232`	`2232`	`else`
`2233`	`2233`	`{`
`2234`	`2234`	`// Prior to BLR version 5 timestamps were converted to text in the dd-MMM-yyyy format`
`2235`		`- sprintf(p, "%d-%.3s-%d",`
	`2235`	`+ sprintf(p, "%2.2d-%.3s-%4.4d",`
`2236`	`2236`	`times.tm_mday,`
`2237`	`2237`	`FB_LONG_MONTHS_UPPER[times.tm_mon], times.tm_year + 1900);`
`2238`	`2238`	`}`