Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17109 fix pre-existing issues with date/time arithmetic

This commit is contained in:
Gavin King 2023-08-20 20:49:02 +02:00
parent 2e5c6fe3a1
commit d876efb860
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
View File

@ -753,20 +753,23 @@ public class CockroachDialect extends Dialect {
@Override
public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
if ( intervalType != null ) {
return "(?2+?3)";
}
switch ( unit ) {
return intervalType != null
? "(?2+?3)"
: "cast(?3+" + intervalPattern( unit ) + " as " + temporalType.name().toLowerCase() + ")";
}
private static String intervalPattern(TemporalUnit unit) {
switch (unit) {
case NANOSECOND:
return "(?3+(?2)/1e3*interval '1 microsecond')";
return "(?2)/1e3*interval '1 microsecond'";
case NATIVE:
return "(?3+(?2)*interval '1 microsecond')";
return "(?2)*interval '1 second'";
case QUARTER: //quarter is not supported in interval literals
return "(?3+(?2)*interval '3 month')";
return "(?2)*interval '3 month'";
case WEEK: //week is not supported in interval literals
return "(?3+(?2)*interval '7 day')";
return "(?2)*interval '7 day'";
default:
return "(?3+(?2)*interval '1 ?1')";
return "(?2)*interval '1 " + unit + "'";
}
}

21
hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
View File

@ -465,20 +465,23 @@ public class PostgreSQLDialect extends Dialect {
@Override
public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
if ( intervalType != null ) {
return "(?2+?3)";
}
switch ( unit ) {
return intervalType != null
? "(?2+?3)"
: "cast(?3+" + intervalPattern( unit ) + " as " + temporalType.name().toLowerCase() + ")";
}
private static String intervalPattern(TemporalUnit unit) {
switch (unit) {
case NANOSECOND:
return "(?3+(?2)/1e3*interval '1 microsecond')";
return "(?2)/1e3*interval '1 microsecond'";
case NATIVE:
return "(?3+(?2)*interval '1 second')";
return "(?2)*interval '1 second'";
case QUARTER: //quarter is not supported in interval literals
return "(?3+(?2)*interval '3 month')";
return "(?2)*interval '3 month'";
case WEEK: //week is not supported in interval literals
return "(?3+(?2)*interval '7 day')";
return "(?2)*interval '7 day'";
default:
return "(?3+(?2)*interval '1 ?1')";
return "(?2)*interval '1 " + unit + "'";
}
}