normanj-bitquill commented on code in PR #3833:
URL: https://github.com/apache/calcite/pull/3833#discussion_r1667198231
##########
core/src/main/java/org/apache/calcite/util/format/postgresql/PostgresqlDateTimeFormatter.java:
##########
@@ -38,90 +45,164 @@ public class PostgresqlDateTimeFormatter {
@SuppressWarnings("TemporalAccessorGetChronoField")
private static final FormatPattern[] FORMAT_PATTERNS = new FormatPattern[] {
new NumberFormatPattern(
- dt -> {
- final int hour = dt.get(ChronoField.HOUR_OF_AMPM);
- return String.format(Locale.ROOT, "%02d", hour == 0 ? 12 : hour);
- },
- "HH12"),
- new NumberFormatPattern(
+ ChronoUnitEnum.HOURS_IN_DAY,
+ 0,
+ 23,
+ 2,
dt -> String.format(Locale.ROOT, "%02d", dt.getHour()),
"HH24"),
new NumberFormatPattern(
+ ChronoUnitEnum.HOURS_IN_HALF_DAY,
+ 1,
+ 12,
+ 2,
dt -> {
final int hour = dt.get(ChronoField.HOUR_OF_AMPM);
return String.format(Locale.ROOT, "%02d", hour == 0 ? 12 : hour);
},
- "HH"),
+ "HH12", "HH"),
new NumberFormatPattern(
+ ChronoUnitEnum.MINUTES_IN_HOUR,
+ 0,
+ 59,
+ 2,
dt -> String.format(Locale.ROOT, "%02d", dt.getMinute()),
"MI"),
new NumberFormatPattern(
+ ChronoUnitEnum.SECONDS_IN_DAY,
+ 0,
+ 24 * 60 * 60 - 1,
+ 5,
dt -> Integer.toString(dt.get(ChronoField.SECOND_OF_DAY)),
- "SSSSS", "SSSS"),
+ "SSSSS"),
new NumberFormatPattern(
+ ChronoUnitEnum.SECONDS_IN_DAY,
+ 0,
+ 9999,
+ 4,
+ dt -> Integer.toString(dt.get(ChronoField.SECOND_OF_DAY)),
+ "SSSS"),
+ new NumberFormatPattern(
+ ChronoUnitEnum.SECONDS_IN_MINUTE,
+ 0,
+ 59,
+ 2,
dt -> String.format(Locale.ROOT, "%02d", dt.getSecond()),
"SS"),
new NumberFormatPattern(
+ ChronoUnitEnum.MILLIS,
+ 0,
+ 999,
+ 3,
dt -> String.format(Locale.ROOT, "%03d",
dt.get(ChronoField.MILLI_OF_SECOND)),
"MS"),
new NumberFormatPattern(
+ ChronoUnitEnum.MICROS,
+ 0,
+ 999_999,
+ 6,
dt -> String.format(Locale.ROOT, "%06d",
dt.get(ChronoField.MICRO_OF_SECOND)),
"US"),
new NumberFormatPattern(
+ ChronoUnitEnum.TENTHS_OF_SECOND,
+ 0,
+ 9,
+ 1,
dt -> Integer.toString(dt.get(ChronoField.MILLI_OF_SECOND) / 100),
"FF1"),
new NumberFormatPattern(
+ ChronoUnitEnum.HUNDREDTHS_OF_SECOND,
+ 0,
+ 99,
+ 2,
dt -> String.format(Locale.ROOT, "%02d",
dt.get(ChronoField.MILLI_OF_SECOND) / 10),
"FF2"),
new NumberFormatPattern(
+ ChronoUnitEnum.THOUSANDTHS_OF_SECOND,
+ 0,
+ 999,
+ 3,
dt -> String.format(Locale.ROOT, "%03d",
dt.get(ChronoField.MILLI_OF_SECOND)),
"FF3"),
new NumberFormatPattern(
+ ChronoUnitEnum.TENTHS_OF_MS,
+ 0,
+ 9_999,
+ 4,
dt -> String.format(Locale.ROOT, "%04d",
dt.get(ChronoField.MICRO_OF_SECOND) / 100),
"FF4"),
new NumberFormatPattern(
+ ChronoUnitEnum.HUNDREDTHS_OF_MS,
+ 0,
+ 99_999,
+ 5,
dt -> String.format(Locale.ROOT, "%05d",
dt.get(ChronoField.MICRO_OF_SECOND) / 10),
"FF5"),
new NumberFormatPattern(
+ ChronoUnitEnum.THOUSANDTHS_OF_MS,
+ 0,
+ 999_999,
+ 6,
dt -> String.format(Locale.ROOT, "%06d",
dt.get(ChronoField.MICRO_OF_SECOND)),
"FF6"),
- new EnumStringFormatPattern(ChronoField.AMPM_OF_DAY, "AM", "PM"),
- new EnumStringFormatPattern(ChronoField.AMPM_OF_DAY, "am", "pm"),
- new EnumStringFormatPattern(ChronoField.AMPM_OF_DAY, "A.M.", "P.M."),
- new EnumStringFormatPattern(ChronoField.AMPM_OF_DAY, "a.m.", "p.m."),
- new NumberFormatPattern(dt -> {
- final String formattedYear = String.format(Locale.ROOT, "%0,4d",
dt.getYear());
- if (formattedYear.length() == 4 && formattedYear.charAt(0) == '0') {
- return "0," + formattedYear.substring(1);
- } else {
- return formattedYear;
- }
- }, "Y,YYY") {
- @Override protected String trimLeadingZeros(String value) {
- return value;
- }
- },
- new NumberFormatPattern(
+ new EnumStringFormatPattern(
+ ChronoUnitEnum.HALF_DAYS,
+ ChronoField.AMPM_OF_DAY,
+ "AM", "PM"),
+ new EnumStringFormatPattern(
+ ChronoUnitEnum.HALF_DAYS,
+ ChronoField.AMPM_OF_DAY,
+ "am", "pm"),
+ new EnumStringFormatPattern(
+ ChronoUnitEnum.HALF_DAYS,
+ ChronoField.AMPM_OF_DAY,
+ "A.M.", "P.M."),
+ new EnumStringFormatPattern(
+ ChronoUnitEnum.HALF_DAYS,
+ ChronoField.AMPM_OF_DAY,
+ "a.m.", "p.m."),
+ new YearWithCommasFormatPattern(),
+ new NumberFormatPattern(
+ ChronoUnitEnum.YEARS,
+ 0,
Review Comment:
Fixed up the behaviour here and added a test.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
