-
Notifications
You must be signed in to change notification settings - Fork 686
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: EXPOSED-353 dateLiteral does not work on OracleDB 12c or 19c (#2057
) * EXPOSED-353 dateLiteral does not work on OracleDB 12c or 19c #1338
- Loading branch information
1 parent
16140aa
commit 048b62a
Showing
7 changed files
with
311 additions
and
28 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
93 changes: 93 additions & 0 deletions
93
exposed-java-time/src/test/kotlin/org/jetbrains/exposed/DateTimeLiteralTest.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package org.jetbrains.exposed | ||
|
|
||
| import org.jetbrains.exposed.dao.id.IntIdTable | ||
| import org.jetbrains.exposed.sql.insert | ||
| import org.jetbrains.exposed.sql.javatime.* | ||
| import org.jetbrains.exposed.sql.selectAll | ||
| import org.jetbrains.exposed.sql.tests.DatabaseTestsBase | ||
| import org.jetbrains.exposed.sql.tests.shared.assertEquals | ||
| import org.junit.Test | ||
| import java.time.Instant | ||
| import java.time.LocalDate | ||
| import java.time.LocalDateTime | ||
| import kotlin.test.assertNotNull | ||
|
|
||
| class DateTimeLiteralTest : DatabaseTestsBase() { | ||
| private val defaultDate = LocalDate.of(2000, 1, 1) | ||
| private val futureDate = LocalDate.of(3000, 1, 1) | ||
|
|
||
| object TableWithDate : IntIdTable() { | ||
| val date = date("date") | ||
| } | ||
|
|
||
| private val defaultDatetime = LocalDateTime.of(2000, 1, 1, 8, 0, 0, 100000000) | ||
| private val futureDatetime = LocalDateTime.of(3000, 1, 1, 8, 0, 0, 100000000) | ||
|
|
||
| object TableWithDatetime : IntIdTable() { | ||
| val datetime = datetime("datetime") | ||
| } | ||
|
|
||
| private val defaultTimestamp = Instant.parse("2000-01-01T01:00:00.00Z") | ||
|
|
||
| object TableWithTimestamp : IntIdTable() { | ||
| val timestamp = timestamp("timestamp") | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByDateLiteralEquality() { | ||
| withTables(TableWithDate) { | ||
| TableWithDate.insert { | ||
| it[date] = defaultDate | ||
| } | ||
|
|
||
| val query = TableWithDate.select(TableWithDate.date).where { TableWithDate.date eq dateLiteral(defaultDate) } | ||
| assertEquals(defaultDate, query.single()[TableWithDate.date]) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByDateLiteralComparison() { | ||
| withTables(TableWithDate) { | ||
| TableWithDate.insert { | ||
| it[date] = defaultDate | ||
| } | ||
| val query = TableWithDate.selectAll().where { TableWithDate.date less dateLiteral(futureDate) } | ||
| assertNotNull(query.firstOrNull()) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByDatetimeLiteralEquality() { | ||
| withTables(TableWithDatetime) { | ||
| TableWithDatetime.insert { | ||
| it[datetime] = defaultDatetime | ||
| } | ||
|
|
||
| val query = TableWithDatetime.select(TableWithDatetime.datetime).where { TableWithDatetime.datetime eq dateTimeLiteral(defaultDatetime) } | ||
| assertEquals(defaultDatetime, query.single()[TableWithDatetime.datetime]) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByDatetimeLiteralComparison() { | ||
| withTables(TableWithDatetime) { | ||
| TableWithDatetime.insert { | ||
| it[datetime] = defaultDatetime | ||
| } | ||
| val query = TableWithDatetime.selectAll().where { TableWithDatetime.datetime less dateTimeLiteral(futureDatetime) } | ||
| assertNotNull(query.firstOrNull()) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByTimestampLiteralEquality() { | ||
| withTables(TableWithTimestamp) { | ||
| TableWithTimestamp.insert { | ||
| it[timestamp] = defaultTimestamp | ||
| } | ||
|
|
||
| val query = TableWithTimestamp.select(TableWithTimestamp.timestamp).where { TableWithTimestamp.timestamp eq timestampLiteral(defaultTimestamp) } | ||
| assertEquals(defaultTimestamp, query.single()[TableWithTimestamp.timestamp]) | ||
| } | ||
| } | ||
| } |
This file contains 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
47 changes: 47 additions & 0 deletions
47
exposed-jodatime/src/test/kotlin/org/jetbrains/exposed/JodaDateTimeLiteralTest.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package org.jetbrains.exposed | ||
|
|
||
| import org.jetbrains.exposed.dao.id.IntIdTable | ||
| import org.jetbrains.exposed.sql.insert | ||
| import org.jetbrains.exposed.sql.jodatime.dateTimeLiteral | ||
| import org.jetbrains.exposed.sql.jodatime.datetime | ||
| import org.jetbrains.exposed.sql.selectAll | ||
| import org.jetbrains.exposed.sql.tests.DatabaseTestsBase | ||
| import org.jetbrains.exposed.sql.tests.shared.assertEquals | ||
| import org.joda.time.DateTime | ||
| import org.joda.time.format.DateTimeFormat | ||
| import org.junit.Test | ||
| import kotlin.test.assertNotNull | ||
|
|
||
| class JodaDateTimeLiteralTest : DatabaseTestsBase() { | ||
| private val pattern = "dd-mm-yyyy hh.mm.ss" | ||
|
|
||
| private val defaultDatetime: DateTime = DateTime.parse("01-01-2000 01.00.00", DateTimeFormat.forPattern(pattern)) | ||
| private val futureDatetime: DateTime = DateTime.parse("01-01-3000 01.00.00", DateTimeFormat.forPattern(pattern)) | ||
|
|
||
| object TableWithDatetime : IntIdTable() { | ||
| val datetime = datetime("datetime") | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByDatetimeLiteralEquality() { | ||
| withTables(TableWithDatetime) { | ||
| TableWithDatetime.insert { | ||
| it[datetime] = defaultDatetime | ||
| } | ||
|
|
||
| val query = TableWithDatetime.select(TableWithDatetime.datetime).where { TableWithDatetime.datetime eq dateTimeLiteral(defaultDatetime) } | ||
| assertEquals(defaultDatetime, query.single()[TableWithDatetime.datetime]) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testSelectByDatetimeLiteralComparison() { | ||
| withTables(TableWithDatetime) { | ||
| TableWithDatetime.insert { | ||
| it[datetime] = defaultDatetime | ||
| } | ||
| val query = TableWithDatetime.selectAll().where { TableWithDatetime.datetime less dateTimeLiteral(futureDatetime) } | ||
| assertNotNull(query.firstOrNull()) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.