@@ -1024,7 +1024,7 @@ public void testCastFunction(SessionFactoryScope scope) {
10241024 assertThat ( session .createQuery ("select cast('1911-10-09 12:13:14.123' as Timestamp)" , Timestamp .class ).getSingleResult (), instanceOf (Timestamp .class ) );
10251025
10261026 assertThat ( session .createQuery ("select cast(date 1911-10-09 as String)" , String .class ).getSingleResult (), is ("1911-10-09" ) );
1027- assertThat ( session .createQuery ("select cast(time 12:13:14 as String)" , String .class ).getSingleResult (), anyOf ( is ("12:13:14" ), is ("12:13:14.0000" ), is ("12.13.14" ) ) );
1027+ assertThat ( session .createQuery ("select cast(time 12:13:14 as String)" , String .class ).getSingleResult (), anyOf ( is ("12:13:14" ), is ("12:13:14.0000" ), is ("12:13:14.000" ), is ( "12 .13.14" ) ) );
10281028 assertThat ( session .createQuery ("select cast(datetime 1911-10-09 12:13:14 as String)" , String .class ).getSingleResult (), anyOf ( startsWith ("1911-10-09 12:13:14" ), startsWith ("1911-10-09-12.13.14" ) ) );
10291029
10301030 assertThat ( session .createQuery ("select cast(local datetime as Instant)" , Instant .class ).getSingleResult (), instanceOf (Instant .class ) );
@@ -1224,7 +1224,7 @@ public void testStrFunction(SessionFactoryScope scope) {
12241224 .list ();
12251225 assertThat ( session .createQuery ("select str(69)" , String .class ).getSingleResult (), is ("69" ) );
12261226 assertThat ( session .createQuery ("select str(date 1911-10-09)" , String .class ).getSingleResult (), is ("1911-10-09" ) );
1227- assertThat ( session .createQuery ("select str(time 12:13:14)" , String .class ).getSingleResult (), anyOf ( is ( "12:13:14" ), is ( "12:13:14.0000" ), is ( "12.13.14" ) ) );
1227+ assertThat ( session .createQuery ("select str(time 12:13:14)" , String .class ).getSingleResult (), anyOf ( is ( "12:13:14" ), is ( "12:13:14.0000" ), is ( "12:13:14.000" ), is ( "12 .13.14" ) ) );
12281228 }
12291229 );
12301230 }
@@ -2078,11 +2078,6 @@ public void testExtractFunction(SessionFactoryScope scope) {
20782078 session .createQuery ("select extract(day from e.theDate) from EntityOfBasics e" , Integer .class )
20792079 .list ();
20802080
2081- session .createQuery ("select extract(day of year from e.theDate) from EntityOfBasics e" , Integer .class )
2082- .list ();
2083- session .createQuery ("select extract(day of month from e.theDate) from EntityOfBasics e" , Integer .class )
2084- .list ();
2085-
20862081 session .createQuery ("select extract(quarter from e.theDate) from EntityOfBasics e" , Integer .class )
20872082 .list ();
20882083
@@ -2113,11 +2108,6 @@ public void testExtractFunction(SessionFactoryScope scope) {
21132108 session .createQuery ("select extract(time from local datetime), extract(date from local datetime) from EntityOfBasics e" , Object [].class )
21142109 .list ();
21152110
2116- session .createQuery ("select extract(week of month from current date) from EntityOfBasics e" , Integer .class )
2117- .list ();
2118- session .createQuery ("select extract(week of year from current date) from EntityOfBasics e" , Integer .class )
2119- .list ();
2120-
21212111 assertThat ( session .createQuery ("select extract(year from date 1974-03-25)" , Integer .class ).getSingleResult (), is (1974 ) );
21222112 assertThat ( session .createQuery ("select extract(month from date 1974-03-25)" , Integer .class ).getSingleResult (), is (3 ) );
21232113 assertThat ( session .createQuery ("select extract(day from date 1974-03-25)" , Integer .class ).getSingleResult (), is (25 ) );
@@ -2128,6 +2118,24 @@ public void testExtractFunction(SessionFactoryScope scope) {
21282118 );
21292119 }
21302120
2121+ @ Test
2122+ public void testExtractFunctionDayOfWeekOf (SessionFactoryScope scope ) {
2123+ scope .inTransaction (
2124+ session -> {
2125+ session .createQuery ("select extract(day of year from e.theDate) from EntityOfBasics e" , Integer .class )
2126+ .list ();
2127+ session .createQuery ("select extract(day of month from e.theDate) from EntityOfBasics e" , Integer .class )
2128+ .list ();
2129+
2130+ session .createQuery ("select extract(week of month from current date) from EntityOfBasics e" , Integer .class )
2131+ .list ();
2132+ session .createQuery ("select extract(week of year from current date) from EntityOfBasics e" , Integer .class )
2133+ .list ();
2134+
2135+ }
2136+ );
2137+ }
2138+
21312139 @ Test
21322140 public void testExtractFunctionEpoch (SessionFactoryScope scope ) {
21332141 scope .inTransaction (
0 commit comments