HHH-18837 Oracle epoch extraction doesn't work with dates #10296
+96
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbellade
requested changes
Jun 9, 2025
hibernate-core/src/test/java/org/hibernate/orm/test/query/OracleDateTypeTest.java
Outdated
Show resolved
Hide resolved
hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
Outdated
Show resolved
Hide resolved
peter1123581321
force-pushed
the
HHH-18837
branch
from
3fabc9e to
01e548f
Compare
mbellade
reviewed
Jun 11, 2025
There was a problem hiding this comment.
Much better @peter1123581321, left another round of minor comments.
Comment on lines
+39
to
+49
| final ExtractUnit field = (ExtractUnit) sqlAstArguments.get( 0 ); | ||
| final TemporalUnit unit = field.getUnit(); | ||
| final Expression expression = (Expression) sqlAstArguments.get( 1 ); | ||
| final TemporalType temporalType; | ||
| if ( unit.equals( TemporalUnit.EPOCH ) && (temporalType = getSqlTemporalType( | ||
| expression.getExpressionType() )) != null ) { | ||
| return temporalType == TemporalType.DATE | ||
| ? "trunc((cast(from_tz(cast(?2 as timestamp),'UTC') as date) - date '1970-1-1')*86400)" | ||
| : "trunc((cast(?2 at time zone 'UTC' as date) - date '1970-1-1')*86400)"; | ||
| } | ||
| return dialect.extractPattern( unit ); |
There was a problem hiding this comment.
Suggested change
| final ExtractUnit field = (ExtractUnit) sqlAstArguments.get( 0 ); | |
| final TemporalUnit unit = field.getUnit(); | |
| final Expression expression = (Expression) sqlAstArguments.get( 1 ); | |
| final TemporalType temporalType; | |
| if ( unit.equals( TemporalUnit.EPOCH ) && (temporalType = getSqlTemporalType( | |
| expression.getExpressionType() )) != null ) { | |
| return temporalType == TemporalType.DATE | |
| ? "trunc((cast(from_tz(cast(?2 as timestamp),'UTC') as date) - date '1970-1-1')*86400)" | |
| : "trunc((cast(?2 at time zone 'UTC' as date) - date '1970-1-1')*86400)"; | |
| } | |
| return dialect.extractPattern( unit ); | |
| final ExtractUnit field = (ExtractUnit) sqlAstArguments.get( 0 ); | |
| final TemporalUnit unit = field.getUnit(); | |
| if ( unit == EPOCH ) { | |
| final Expression expression = (Expression) sqlAstArguments.get( 1 ); | |
| final JdbcMappingContainer type = expression.getExpressionType(); | |
| final TemporalType temporalType = type != null ? getSqlTemporalType( type ) : null; | |
| if ( temporalType == TemporalType.DATE ) { | |
| return "trunc((cast(from_tz(cast(?2 as timestamp),'UTC') as date) - date '1970-1-1')*86400)"; | |
| } | |
| } | |
| return dialect.extractPattern( unit ); |
| * Oracle extract() function | ||
| */ | ||
| public void extract_oracle(Dialect dialect) { | ||
| functionRegistry.register( "extract", new OracleExtractFunction( dialect, typeConfiguration ) ); |
There was a problem hiding this comment.
Let's just instantiate the custom function directly in OracleDialect, no need to add a function here.
There was a problem hiding this comment.
I was about to say the same thing :)
| @@ -624,7 +626,6 @@ public String extractPattern(TemporalUnit unit) { | |||
| case HOUR -> "to_number(to_char(?2,'HH24'))"; | |||
| case MINUTE -> "to_number(to_char(?2,'MI'))"; | |||
| case SECOND -> "to_number(to_char(?2,'SS'))"; | |||
| case EPOCH -> "trunc((cast(?2 at time zone 'UTC' as date) - date '1970-1-1')*86400)"; | |||
There was a problem hiding this comment.
I think we still need to keep this line, the extractPattern method is also used in duration arithmetic IIRC.
peter1123581321
force-pushed
the
HHH-18837
branch
from
01e548f to
170063c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes an error when using
epochwith dates on Oracle.I added an overload of
extractPattern(which is overridden inOracleDialect) to handle differentTemporalType.This new method is only used in
ExtractFunctionin context ofOracleDialect.https://hibernate.atlassian.net/browse/HHH-18837
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.