Skip to content

fix: EXPOSED-644 Can't use Instant.DISTANT_FUTURE as default value #2832

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.

Sign up for GitHub

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

Open
Chantal Loncle (bog-walk) wants to merge 1 commit into
base: main
Choose a base branch
from
+79 −9
Open

fix: EXPOSED-644 Can't use Instant.DISTANT_FUTURE as default value #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/InstantColumnType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ abstract class InstantColumnType<T> : ColumnType<T>(), IDateColumnType {
} else {
MYSQL_TIMESTAMP_FORMAT
}
"'${formatter.format(localDateTime)}'"
"'${formatter.formatAndTrimStart(localDateTime)}'"
}
is SQLiteDialect -> "'${ORACLE_SQLITE_TIMESTAMP_FORMAT.format(localDateTime)}'"
is SQLiteDialect -> "'${ORACLE_SQLITE_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)}'"
is OracleDialect -> {
val formatted = ORACLE_SQLITE_TIMESTAMP_FORMAT.format(localDateTime)
val formatted = ORACLE_SQLITE_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)
"TO_TIMESTAMP('$formatted', 'YYYY-MM-DD HH24:MI:SS.FF3')"
}
else -> "'${DEFAULT_TIMESTAMP_FORMAT.format(localDateTime)}'"
else -> "'${DEFAULT_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)}'"
}
}

Expand Down Expand Up @@ -106,15 +106,15 @@ abstract class InstantColumnType<T> : ColumnType<T>(), IDateColumnType {
@OptIn(InternalApi::class)
@Suppress("MagicNumber")
return when (val dialect = currentDialect) {
is SQLiteDialect -> ORACLE_SQLITE_TIMESTAMP_FORMAT.format(localDateTime)
is SQLiteDialect -> ORACLE_SQLITE_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)
is MysqlDialect if (
dialect !is MariaDBDialect &&
!currentTransaction().db.version.covers(8, 0)
) -> {
if (dialect.isFractionDateTimeSupported()) {
MYSQL_TIMESTAMP_FRACTION_FORMAT.format(localDateTime)
MYSQL_TIMESTAMP_FRACTION_FORMAT.formatAndTrimStart(localDateTime)
} else {
MYSQL_TIMESTAMP_FORMAT.format(localDateTime)
MYSQL_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)
}
}
else -> localDateTime.toSqlTimestamp()
Expand All @@ -128,14 +128,16 @@ abstract class InstantColumnType<T> : ColumnType<T>(), IDateColumnType {

return when {
dialect is PostgreSQLDialect -> {
val formatted = ORACLE_SQLITE_TIMESTAMP_FORMAT.format(localDateTime)
val formatted = ORACLE_SQLITE_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)
"'${formatted.trimEnd('0').trimEnd('.')}'::timestamp without time zone"
}
dialect.h2Mode == H2Dialect.H2CompatibilityMode.Oracle -> {
val formatted = ORACLE_SQLITE_TIMESTAMP_FORMAT.format(localDateTime)
val formatted = ORACLE_SQLITE_TIMESTAMP_FORMAT.formatAndTrimStart(localDateTime)
"'${formatted.trimEnd('0').trimEnd('.')}'"
}
else -> super.nonNullValueAsDefaultString(value)
}
}

private fun DateTimeFormat<LocalDateTime>.formatAndTrimStart(value: LocalDateTime): String = format(value).trimStart('+')
}
34 changes: 34 additions & 0 deletions exposed-kotlin-datetime/src/test/kotlin/org/jetbrains/exposed/v1/datetime/DefaultsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.jetbrains.exposed.v1.dao.EntityClass
import org.jetbrains.exposed.v1.dao.IntEntity
import org.jetbrains.exposed.v1.dao.IntEntityClass
import org.jetbrains.exposed.v1.dao.flushCache
import org.jetbrains.exposed.v1.exceptions.ExposedSQLException
import org.jetbrains.exposed.v1.jdbc.*
import org.jetbrains.exposed.v1.tests.DatabaseTestsBase
import org.jetbrains.exposed.v1.tests.MISSING_R2DBC_TEST
Expand Down Expand Up @@ -672,4 +673,37 @@ class DefaultsTest : DatabaseTestsBase() {
assertEquals(timestamp, entity[DefaultTimestampTable.timestamp])
}
}

@Test
fun testTimestampWithDistantFutureDefault() {
val tester = object : Table("tester") {
// Kotlin DISTANT_FUTURE == +100000-01-01T00:00:00Z
val status_end = timestamp("status_end").default(Instant.DISTANT_FUTURE)
val activity_end = timestamp("activity_end").clientDefault { Instant.DISTANT_FUTURE }
}

withDb { testDb ->
// Stored range for these DB (& SQL Server) has maximum year 9999
if (testDb == TestDB.ORACLE || testDb in TestDB.ALL_MYSQL_MARIADB) {
// Out-of-range TS value not even acceptable as just default value
expectException<ExposedSQLException> { SchemaUtils.create(tester) }
} else {
SchemaUtils.create(tester)

if (testDb == TestDB.SQLSERVER) {
// TS value is only checked whether out-of-range on insert
expectException<ExposedSQLException> { tester.insert { } }
} else {
tester.insert { }

val results = tester.selectAll().singleOrNull()
assertNotNull(results)
assertEquals(Instant.DISTANT_FUTURE, results[tester.status_end])
assertEquals(Instant.DISTANT_FUTURE, results[tester.activity_end])
}

SchemaUtils.drop(tester)
}
}
}
}
34 changes: 34 additions & 0 deletions ...s/src/test/kotlin/org/jetbrains/exposed/v1/r2dbc/sql/tests/kotlindatetime/DefaultsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.jetbrains.exposed.v1.r2dbc.sql.tests.kotlindatetime
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.single
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.datetime.*
import org.jetbrains.exposed.v1.core.*
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
Expand Down Expand Up @@ -571,4 +572,37 @@ class DefaultsTest : R2dbcDatabaseTestsBase() {
assertEquals(timestamp, entity[DefaultTimestampTable.timestamp])
}
}

@Test
fun testTimestampWithDistantFutureDefault() {
val tester = object : Table("tester") {
// Kotlin DISTANT_FUTURE == +100000-01-01T00:00:00Z
val status_end = timestamp("status_end").default(Instant.DISTANT_FUTURE)
val activity_end = timestamp("activity_end").clientDefault { Instant.DISTANT_FUTURE }
}

withDb { testDb ->
// Stored range for these DB (& SQL Server) has maximum year 9999
if (testDb == TestDB.ORACLE || testDb in TestDB.ALL_MYSQL_MARIADB) {
// Out-of-range TS value not even acceptable as just default value
expectException<ExposedR2dbcException> { SchemaUtils.create(tester) }
} else {
SchemaUtils.create(tester)

if (testDb == TestDB.SQLSERVER) {
// TS value is only checked whether out-of-range on insert
expectException<ExposedR2dbcException> { tester.insert { } }
} else {
tester.insert { }

val results = tester.selectAll().singleOrNull()
assertNotNull(results)
assertEquals(Instant.DISTANT_FUTURE, results[tester.status_end])
assertEquals(Instant.DISTANT_FUTURE, results[tester.activity_end])
}

SchemaUtils.drop(tester)
}
}
}
}
Loading