Fixed date_format() for day of month specifier

Georg Traar · mergify[bot] · commit 5651d8d4f6d1 · 2021-10-14T14:56:09.000Z
diff --git a/docs/appendices/release-notes/unreleased.rst b/docs/appendices/release-notes/unreleased.rst
@@ -143,3 +143,7 @@ Fixes
 - Fixed an issue that caused ``UNION ALL`` statements to succeed or throw
   unexpected exceptions when the ``SELECT`` results for ``UNION ALL`` included
   object types with identically named but differently typed sub-columns.
+
+- Fixed an issue that caused ``date_format()`` to return wrong values when used
+  with the ``%D`` specifier (day of month as ordinal number) for 11th, 12th and
+  13th.
diff --git a/server/src/main/java/io/crate/expression/scalar/TimestampFormatter.java b/server/src/main/java/io/crate/expression/scalar/TimestampFormatter.java
@@ -78,19 +78,20 @@ public String format(DateTime timestamp) {
                 builder.append(n);
                 if (n >= 11 && n <= 13) {
                     builder.append("th");
-                }
-                switch (n % 10) {
-                    case 1:
-                        builder.append("st");
-                        break;
-                    case 2:
-                        builder.append("nd");
-                        break;
-                    case 3:
-                        builder.append("rd");
-                        break;
-                    default:
-                        builder.append("th");
+                } else {
+                    switch (n % 10) {
+                        case 1:
+                            builder.append("st");
+                            break;
+                        case 2:
+                            builder.append("nd");
+                            break;
+                        case 3:
+                            builder.append("rd");
+                            break;
+                        default:
+                            builder.append("th");
+                    }
                 }
                 return builder.toString();
             }
diff --git a/server/src/test/java/io/crate/expression/scalar/DateFormatFunctionTest.java b/server/src/test/java/io/crate/expression/scalar/DateFormatFunctionTest.java
@@ -227,4 +227,11 @@ public void testInvalidFormats() {
             Literal.of("%t%%%Z"),
             Literal.of(DataTypes.TIMESTAMPZ, DataTypes.TIMESTAMPZ.implicitCast("2000-01-01")));
     }
+
+    @Test
+    public void testDayOfMonthWithEnglishSuffix() throws Exception {
+        assertNormalize("date_format('%D', '2021-10-01')", isLiteral("1st"));
+        assertNormalize("date_format('%D', '2021-10-12')", isLiteral("12th"));
+        assertNormalize("date_format('%D', '2021-10-22')", isLiteral("22nd"));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -227,4 +227,11 @@ public void testInvalidFormats() {`
`227`	`227`	`Literal.of("%t%%%Z"),`
`228`	`228`	`Literal.of(DataTypes.TIMESTAMPZ, DataTypes.TIMESTAMPZ.implicitCast("2000-01-01")));`
`229`	`229`	`}`
	`230`	`+`
	`231`	`+ @Test`
	`232`	`+ public void testDayOfMonthWithEnglishSuffix() throws Exception {`
	`233`	`+ assertNormalize("date_format('%D', '2021-10-01')", isLiteral("1st"));`
	`234`	`+ assertNormalize("date_format('%D', '2021-10-12')", isLiteral("12th"));`
	`235`	`+ assertNormalize("date_format('%D', '2021-10-22')", isLiteral("22nd"));`
	`236`	`+ }`
`230`	`237`	`}`