Skip to content

fix: EXPOSED-1021 [PostgreSQL][R2DBC] Inserting null on nullable datetime array column throws #2920

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
Open

fix: EXPOSED-1021 [PostgreSQL][R2DBC] Inserting null on nullable datetime array column throws #2920

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
7 changes: 7 additions & 0 deletions exposed-java-time/src/test/kotlin/org/jetbrains/exposed/v1/javatime/JavaTimeTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.jetbrains.exposed.v1.tests.shared.expectException
import org.junit.jupiter.api.Assertions.fail
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertNull
import java.math.BigDecimal
import java.math.RoundingMode
import java.time.*
Expand Down Expand Up @@ -544,20 +545,26 @@ class JavaTimeTests : DatabaseTestsBase() {
val defaultDateTimes = listOf(LocalDateTime.now().asJdk8())
val tester = object : Table("array_tester") {
val dates = array("dates", JavaLocalDateColumnType()).default(defaultDates)
val optDates = array("opt_dates", JavaLocalDateColumnType()).nullable()
val datetimes = array("datetimes", JavaLocalDateTimeColumnType()).default(defaultDateTimes)
val optDatetimes = array("opt_datetimes", JavaLocalDateTimeColumnType()).nullable()
}

withTables(excludeSettings = TestDB.entries - TestDB.POSTGRESQL - TestDB.H2_V2, tester) {
tester.insert { }
val result1 = tester.selectAll().single()
assertEqualLists(result1[tester.dates], defaultDates)
assertNull(result1[tester.optDates])
assertEqualLists(result1[tester.datetimes], defaultDateTimes)
assertNull(result1[tester.optDatetimes])

val datesInput = List(3) { LocalDate.of(2020 + it, 5, 4) }
val datetimeInput = List(3) { LocalDateTime.of(2020 + it, 5, 4, 9, 9, 9) }
tester.insert {
it[dates] = datesInput
it[optDates] = null
it[datetimes] = datetimeInput
it[optDatetimes] = null
}

val lastDate = tester.dates[3]
Expand Down
7 changes: 7 additions & 0 deletions exposed-jodatime/src/test/kotlin/org/jetbrains/exposed/v1/jodatime/JodaTimeTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import org.joda.time.DateTime
import org.joda.time.DateTimeZone
import org.joda.time.LocalTime
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertNull
import kotlin.test.assertEquals

class JodaTimeTests : DatabaseTestsBase() {
Expand Down Expand Up @@ -418,20 +419,26 @@ class JodaTimeTests : DatabaseTestsBase() {
val defaultDateTimes = listOf(DateTime.now())
val tester = object : Table("array_tester") {
val dates = array("dates", JodaLocalDateColumnType()).default(defaultDates)
val optDates = array("opt_dates", JodaLocalDateColumnType()).nullable()
val datetimes = array("datetimes", JodaLocalDateTimeColumnType()).default(defaultDateTimes)
val optDatetimes = array("opt_datetimes", JodaLocalDateTimeColumnType()).nullable()
}

withTables(excludeSettings = TestDB.ALL - TestDB.POSTGRESQL - TestDB.H2_V2 - TestDB.H2_V2_PSQL, tester) {
tester.insert { }
val result1 = tester.selectAll().single()
assertEqualLists(result1[tester.dates], defaultDates)
assertNull(result1[tester.optDates])
assertEqualLists(result1[tester.datetimes], defaultDateTimes)
assertNull(result1[tester.optDatetimes])

val datesInput = List(3) { DateTime.parse("${2020 + it}-5-4") }
val datetimeInput = List(3) { DateTime(2020 + it, 5, 4, 9, 9, 9) }
tester.insert {
it[dates] = datesInput
it[optDates] = null
it[datetimes] = datetimeInput
it[optDatetimes] = null
}

val lastDate = tester.dates[3]
Expand Down
7 changes: 7 additions & 0 deletions exposed-kotlin-datetime/src/test/kotlin/org/jetbrains/exposed/v1/datetime/KotlinTimeTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.jetbrains.exposed.v1.tests.shared.assertTrue
import org.jetbrains.exposed.v1.tests.shared.expectException
import org.junit.jupiter.api.Assertions.fail
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertNull
import java.math.BigDecimal
import java.math.RoundingMode
import java.time.OffsetDateTime
Expand Down Expand Up @@ -604,20 +605,26 @@ class KotlinTimeTests : DatabaseTestsBase() {
val defaultDateTimes = listOf(now())
val tester = object : Table("array_tester") {
val dates = array("dates", KotlinLocalDateColumnType()).default(defaultDates)
val optDates = array("opt_dates", KotlinLocalDateColumnType()).nullable()
val datetimes = array("datetimes", KotlinLocalDateTimeColumnType()).default(defaultDateTimes)
val optDatetimes = array("opt_datetimes", KotlinLocalDateTimeColumnType()).nullable()
}

withTables(excludeSettings = TestDB.entries - TestDB.POSTGRESQL - TestDB.H2_V2, tester) {
tester.insert { }
val result1 = tester.selectAll().single()
assertEqualLists(result1[tester.dates], defaultDates)
assertNull(result1[tester.optDates])
assertEqualLists(result1[tester.datetimes], defaultDateTimes)
assertNull(result1[tester.optDatetimes])

val datesInput = List(3) { LocalDate(2020 + it, 5, 4) }
val datetimeInput = List(3) { LocalDateTime(2020 + it, 5, 4, 9, 9, 9) }
tester.insert {
it[dates] = datesInput
it[optDates] = null
it[datetimes] = datetimeInput
it[optDatetimes] = null
}

val lastDate = tester.dates[3]
Expand Down
7 changes: 7 additions & 0 deletions ...-tests/src/test/kotlin/org/jetbrains/exposed/v1/r2dbc/sql/tests/javatime/JavaTimeTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import org.jetbrains.exposed.v1.r2dbc.tests.shared.assertEquals
import org.jetbrains.exposed.v1.r2dbc.tests.shared.assertTrue
import org.jetbrains.exposed.v1.r2dbc.tests.shared.expectException
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertNull
import org.junit.jupiter.api.fail
import java.math.BigDecimal
import java.math.RoundingMode
Expand Down Expand Up @@ -398,20 +399,26 @@ class JavaTimeTests : R2dbcDatabaseTestsBase() {
val defaultDateTimes = listOf(LocalDateTime.now().asJdk8())
val tester = object : Table("array_tester") {
val dates = array("dates", JavaLocalDateColumnType()).default(defaultDates)
val optDates = array("opt_dates", JavaLocalDateColumnType()).nullable()
val datetimes = array("datetimes", JavaLocalDateTimeColumnType()).default(defaultDateTimes)
val optDatetimes = array("opt_datetimes", JavaLocalDateTimeColumnType()).nullable()
}

withTables(excludeSettings = TestDB.entries - TestDB.POSTGRESQL - TestDB.H2_V2, tester) {
tester.insert { }
val result1 = tester.selectAll().single()
assertEqualLists(result1[tester.dates], defaultDates)
assertNull(result1[tester.optDates])
assertEqualLists(result1[tester.datetimes], defaultDateTimes)
assertNull(result1[tester.optDatetimes])

val datesInput = List(3) { LocalDate.of(2020 + it, 5, 4) }
val datetimeInput = List(3) { LocalDateTime.of(2020 + it, 5, 4, 9, 9, 9) }
tester.insert {
it[dates] = datesInput
it[optDates] = null
it[datetimes] = datetimeInput
it[optDatetimes] = null
}

val lastDate = tester.dates[3]
Expand Down
7 changes: 7 additions & 0 deletions ...-tests/src/test/kotlin/org/jetbrains/exposed/v1/r2dbc/sql/tests/jodatime/JodaTimeTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import org.joda.time.DateTime
import org.joda.time.DateTimeZone
import org.joda.time.LocalTime
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertNull
import kotlin.test.assertEquals

class JodaTimeTests : R2dbcDatabaseTestsBase() {
Expand Down Expand Up @@ -322,20 +323,26 @@ class JodaTimeTests : R2dbcDatabaseTestsBase() {
val defaultDateTimes = listOf(DateTime.now())
val tester = object : Table("array_tester") {
val dates = array("dates", JodaLocalDateColumnType()).default(defaultDates)
val optDates = array("opt_dates", JodaLocalDateColumnType()).nullable()
val datetimes = array("datetimes", JodaLocalDateTimeColumnType()).default(defaultDateTimes)
val optDatetimes = array("opt_datetimes", JodaLocalDateTimeColumnType()).nullable()
}

withTables(excludeSettings = TestDB.ALL - TestDB.POSTGRESQL - TestDB.H2_V2 - TestDB.H2_V2_PSQL, tester) {
tester.insert { }
val result1 = tester.selectAll().single()
assertEqualLists(result1[tester.dates], defaultDates)
assertNull(result1[tester.optDates])
assertEqualLists(result1[tester.datetimes], defaultDateTimes)
assertNull(result1[tester.optDatetimes])

val datesInput = List(3) { DateTime.parse("${2020 + it}-5-4") }
val datetimeInput = List(3) { DateTime(2020 + it, 5, 4, 9, 9, 9) }
tester.insert {
it[dates] = datesInput
it[optDates] = null
it[datetimes] = datetimeInput
it[optDatetimes] = null
}

val lastDate = tester.dates[3]
Expand Down
7 changes: 7 additions & 0 deletions ...rc/test/kotlin/org/jetbrains/exposed/v1/r2dbc/sql/tests/kotlindatetime/KotlinTimeTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.jetbrains.exposed.v1.r2dbc.tests.shared.assertTrue
import org.jetbrains.exposed.v1.r2dbc.tests.shared.expectException
import org.junit.jupiter.api.Assertions.fail
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertNull
import java.math.BigDecimal
import java.math.RoundingMode
import java.time.OffsetDateTime
Expand Down Expand Up @@ -445,20 +446,26 @@ class KotlinTimeTests : R2dbcDatabaseTestsBase() {
val defaultDateTimes = listOf(now())
val tester = object : Table("array_tester") {
val dates = array("dates", KotlinLocalDateColumnType()).default(defaultDates)
val optDates = array("opt_dates", KotlinLocalDateColumnType()).nullable()
val datetimes = array("datetimes", KotlinLocalDateTimeColumnType()).default(defaultDateTimes)
val optDatetimes = array("opt_datetimes", KotlinLocalDateTimeColumnType()).nullable()
}

withTables(excludeSettings = TestDB.entries - TestDB.POSTGRESQL - TestDB.H2_V2, tester) {
tester.insert { }
val result1 = tester.selectAll().single()
assertEqualLists(result1[tester.dates], defaultDates)
assertNull(result1[tester.optDates])
assertEqualLists(result1[tester.datetimes], defaultDateTimes)
assertNull(result1[tester.optDatetimes])

val datesInput = List(3) { LocalDate(2020 + it, 5, 4) }
val datetimeInput = List(3) { LocalDateTime(2020 + it, 5, 4, 9, 9, 9) }
tester.insert {
it[dates] = datesInput
it[optDates] = null
it[datetimes] = datetimeInput
it[optDatetimes] = null
}

val lastDate = tester.dates[3]
Expand Down
14 changes: 8 additions & 6 deletions exposed-r2dbc/src/main/kotlin/org/jetbrains/exposed/v1/r2dbc/mappers/ArrayTypeMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ArrayTypeMapper : TypeMapper {
if (columnType !is ArrayColumnType<*, *>) return false

if (value == null) {
statement.bindNull(index - 1, columnType.arrayDeclaration())
statement.bindNull(index - 1, columnType.arrayDeclaration(dialect))
return true
}

Expand Down Expand Up @@ -201,7 +201,7 @@ private fun java.sql.Timestamp.toLocalDateTime(): LocalDateTime = toInstant().at
* Extension function to get the Java class type for an array column type.
*/
@OptIn(ExperimentalUuidApi::class)
private fun ArrayColumnType<*, *>.arrayDeclaration(): Class<out Array<out Any>> = when (delegate) {
private fun ArrayColumnType<*, *>.arrayDeclaration(dialect: DatabaseDialect): Class<out Array<out Any>> = when (delegate) {
is ByteColumnType -> Array<Byte>::class.java
is UByteColumnType -> Array<UByte>::class.java
is ShortColumnType -> Array<Short>::class.java
Expand All @@ -220,11 +220,13 @@ private fun ArrayColumnType<*, *>.arrayDeclaration(): Class<out Array<out Any>>
is CharacterColumnType -> Array<Char>::class.java
is BooleanColumnType -> Array<Boolean>::class.java
is IDateColumnType -> {
val hasTimePart = (delegate as IDateColumnType).hasTimePart
// For date/time types, use Date or Timestamp arrays depending on whether the column type has a time part
if ((delegate as IDateColumnType).hasTimePart) {
Array<java.sql.Timestamp>::class.java
} else {
Array<java.sql.Date>::class.java
when {
hasTimePart && dialect is PostgreSQLDialect -> Array<LocalDateTime>::class.java
hasTimePart -> Array<java.sql.Timestamp>::class.java
dialect is PostgreSQLDialect -> Array<LocalDate>::class.java
else -> Array<java.sql.Date>::class.java
}
}
else -> Array<Any>::class.java
Expand Down
Loading