-
Notifications
You must be signed in to change notification settings - Fork 695
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Add time extension function for temporal expressions in Kotlin and Java #2121
feat: Add time extension function for temporal expressions in Kotlin and Java #2121
Conversation
exposed-jodatime/src/main/kotlin/org/jetbrains/exposed/sql/jodatime/DateFunctions.kt
Outdated
Show resolved
Hide resolved
private fun dateTimeWithFractionFormat(fraction: Int): DateTimeFormatter { | ||
val baseFormat = "YYYY-MM-dd HH:mm:ss" | ||
private fun dateTimeWithFractionFormat(date: String, fraction: Int): DateTimeFormatter { | ||
val containsDatePart = date.contains("T") || date.contains(" ") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that it's duplicated in other datetime packages, and I believe that it works, but is it possible that containsDatePart
is false here?
I wanted to write that if we use method inside DateColumnType
class, and this method takes date: String
argument, it must have date part, but now I see.
I don't expect that it's the problem of this PR, but it might be a problem in the long term. We have a DateColumnType
class that is expected to be used with exact values from the database (actually also different values from different dialects, but it's another problem), but after that we query something like SUBSTRING(CONVERT(NVARCHAR, TestTable."timestamptz-column", 121), 12, 15)
and expect that the column type should parse it also. And the problem is that we actually cannot say which values we expect from the database, we can rely only on what's covered by tests.
But I don't know is it easy to change with the current approach. Particularly for the time function, if the final goal is to return user the date from the whole timestamp, we can query the whole timestamp and extract time on the exposed side (instead of querying time only).
Anyway, it's just some thoughts about the potential problems with maintaining our datetime classes.
exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/FunctionProvider.kt
Outdated
Show resolved
Hide resolved
65335c2
to
6ca6888
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left small comments in the test files.
exposed-java-time/src/test/kotlin/org/jetbrains/exposed/JavaTimeTests.kt
Outdated
Show resolved
Hide resolved
...kotlin-datetime/src/test/kotlin/org/jetbrains/exposed/sql/kotlin/datetime/KotlinTimeTests.kt
Outdated
Show resolved
Hide resolved
...kotlin-datetime/src/test/kotlin/org/jetbrains/exposed/sql/kotlin/datetime/KotlinTimeTests.kt
Outdated
Show resolved
Hide resolved
…and Java H2 V1 is excluded because of a bug in the driver that messes up the fractional seconds
6ca6888
to
15cff13
Compare
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.jetbrains.exposed:exposed-jdbc](https://togithub.com/JetBrains/Exposed) | `0.52.0` -> `0.53.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.exposed:exposed-jdbc/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.exposed:exposed-jdbc/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.exposed:exposed-jdbc/0.52.0/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.exposed:exposed-jdbc/0.52.0/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jetbrains.exposed:exposed-core](https://togithub.com/JetBrains/Exposed) | `0.52.0` -> `0.53.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.exposed:exposed-core/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.exposed:exposed-core/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.exposed:exposed-core/0.52.0/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.exposed:exposed-core/0.52.0/0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>JetBrains/Exposed (org.jetbrains.exposed:exposed-jdbc)</summary> ### [`v0.53.0`](https://togithub.com/JetBrains/Exposed/blob/HEAD/CHANGELOG.md#0530) [Compare Source](https://togithub.com/JetBrains/Exposed/compare/0.52.0...0.53.0) Infrastructure: - SQLite driver 3.46.0.1 - Spring Framework 6.1.11 - Spring Boot 3.3.2 - junit-bom 5.10.3 Features: - feat: Add time extension function for temporal expressions in Kotlin and Java by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2121](https://togithub.com/JetBrains/Exposed/pull/2121) - feat: EXPOSED-435 Allow insertReturning() to set isIgnore = true by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2148](https://togithub.com/JetBrains/Exposed/pull/2148) - feat: EXPOSED-77 Support entity class for table with composite primary key by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/1987](https://togithub.com/JetBrains/Exposed/pull/1987) - feat: EXPOSED-446 Support N-column inList equality comparisons by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2157](https://togithub.com/JetBrains/Exposed/pull/2157) - feat: EXPOSED-450 Merge command: PostgreSQL improvements by [@​obabichevjb](https://togithub.com/obabichevjb) in [https://github.com/JetBrains/Exposed/pull/2161](https://togithub.com/JetBrains/Exposed/pull/2161) - feat: EXPOSED-388 Support for column type converters by [@​obabichevjb](https://togithub.com/obabichevjb) in [https://github.com/JetBrains/Exposed/pull/2143](https://togithub.com/JetBrains/Exposed/pull/2143) - Adding comment text for a query SQL by [@​xJoeWoo](https://togithub.com/xJoeWoo) in [https://github.com/JetBrains/Exposed/pull/2088](https://togithub.com/JetBrains/Exposed/pull/2088) - feat: EXPOSED-459 Open AbstractQuery.copyTo() to allow custom Query class extension by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2173](https://togithub.com/JetBrains/Exposed/pull/2173) - feat: EXPOSED-461 Add time column in Joda-Time module by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2175](https://togithub.com/JetBrains/Exposed/pull/2175) Bug fixes: - fix: EXPOSED-424 ClassCastException exception when using `fetchBatchedResults` with `alias` by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2140](https://togithub.com/JetBrains/Exposed/pull/2140) - fix: EXPOSED-407 compositeMoney() nullability definition issues by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2137](https://togithub.com/JetBrains/Exposed/pull/2137) - fix: EXPOSED-415 SchemaUtils incorrectly generates ALTER statements for existing nullable columns by [@​obabichevjb](https://togithub.com/obabichevjb) in [https://github.com/JetBrains/Exposed/pull/2136](https://togithub.com/JetBrains/Exposed/pull/2136) - fix: EXPOSED-363 LocalTime and literal(LocalTime) are not the same by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2152](https://togithub.com/JetBrains/Exposed/pull/2152) - fix: EXPOSED-432 CurrentDate default is generated as null in MariaDB by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2149](https://togithub.com/JetBrains/Exposed/pull/2149) - fix: Allow column reference in default expressions for MySQL and MariaDB by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2159](https://togithub.com/JetBrains/Exposed/pull/2159) - fix: EXPOSED-430 Insert and BatchInsert do not return default values by [@​obabichevjb](https://togithub.com/obabichevjb) in [https://github.com/JetBrains/Exposed/pull/2158](https://togithub.com/JetBrains/Exposed/pull/2158) - fix: EXPOSED-452 Flaky H2\_Oracle test `testTimestampWithTimeZoneDefaults` by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2169](https://togithub.com/JetBrains/Exposed/pull/2169) - EXPOSED-457 The column default value always compares unequal by [@​obabichevjb](https://togithub.com/obabichevjb) in [https://github.com/JetBrains/Exposed/pull/2170](https://togithub.com/JetBrains/Exposed/pull/2170) - EXPOSED-409 Custom primary key. Access to the primary key fails with ClassCastException by [@​obabichevjb](https://togithub.com/obabichevjb) in [https://github.com/JetBrains/Exposed/pull/2151](https://togithub.com/JetBrains/Exposed/pull/2151) - fix: EXPOSED-447 Eager loading does not work with composite PK entity by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2177](https://togithub.com/JetBrains/Exposed/pull/2177) Docs: - chore: Add migration sample by [@​joc-a](https://togithub.com/joc-a) in [https://github.com/JetBrains/Exposed/pull/2144](https://togithub.com/JetBrains/Exposed/pull/2144) - docs: Change repetitionAttempts to maxAttempts in website docs by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2164](https://togithub.com/JetBrains/Exposed/pull/2164) - docs: EXPOSED-445 Add documentation for DSL & DAO composite primary keys by [@​bog-walk](https://togithub.com/bog-walk) in [https://github.com/JetBrains/Exposed/pull/2165](https://togithub.com/JetBrains/Exposed/pull/2165) - docs: EXPOSED-419 Rework the getting started tutorial by [@​vnikolova](https://togithub.com/vnikolova) in [https://github.com/JetBrains/Exposed/pull/2160](https://togithub.com/JetBrains/Exposed/pull/2160) - Configure API documentation for Exposed by [@​e5l](https://togithub.com/e5l) in [https://github.com/JetBrains/Exposed/pull/2171](https://togithub.com/JetBrains/Exposed/pull/2171) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/DonRobo/home-former). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoiZGV2ZWxvcCIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
time
extension functions for temporal expressions in Kotlin and Java.Time
function to make it work for all database dialects.JodaTimeMiscTableTest
andJodaTimeDefaultsTest
to extendDatabaseTestsBase
instead ofJodaTimeBaseTest
to match the way it is in the Kotlin and Java tests.I'm planning to add more tests to cover more types in later pull requests.