Refactor timestamp handling in AuditableLongIdTable to use OffsetDateTime and CurrentOffsetDateTime

Author: ammodev

api/surf-database-r2dbc.api

@@ -63,16 +63,21 @@ public final class dev/slne/surf/database/columns/NativeUuidColumnTypeKt {
 }
 
 public final class dev/slne/surf/database/columns/time/CurrentOffsetDateTime : dev/slne/surf/database/columns/time/CurrentTimestampBase {
-	public static final field INSTANCE Ldev/slne/surf/database/columns/time/CurrentOffsetDateTime;
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class dev/slne/surf/database/columns/time/CurrentTimestampBase : org/jetbrains/exposed/v1/core/Function {
-	public fun <init> (Lorg/jetbrains/exposed/v1/core/IColumnType;)V
+	public fun <init> (Lorg/jetbrains/exposed/v1/core/IColumnType;Z)V
+	public synthetic fun <init> (Lorg/jetbrains/exposed/v1/core/IColumnType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun toQueryBuilder (Lorg/jetbrains/exposed/v1/core/QueryBuilder;)V
 }
 
 public final class dev/slne/surf/database/columns/time/CurrentZonedDateTime : dev/slne/surf/database/columns/time/CurrentTimestampBase {
-	public static final field INSTANCE Ldev/slne/surf/database/columns/time/CurrentZonedDateTime;
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public final class dev/slne/surf/database/columns/time/OffsetDateTimeColumnType : dev/slne/surf/database/columns/time/UtcInstantDateTimeColumnType {

build.gradle.kts

@@ -64,13 +64,4 @@ publishing {
     repositories {
         slneReleases()
     }
-}
-
-afterEvaluate {
-    tasks.named("publishPluginMavenPublicationToMaven-releasesRepository") {
-        enabled = false
-    }
-    tasks.named("publishPluginMavenPublicationToMavenLocal") {
-        enabled = false
-    }
 }

gradle.properties

@@ -3,5 +3,4 @@ kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
 #org.gradle.caching=true
 #org.gradle.configureondemand=true
-
-version=1.0.1-SNAPSHOT
+version=1.1.0-SNAPSHOT

src/main/kotlin/dev/slne/surf/database/columns/time/OffsetDateTimeColumnType.kt

@@ -23,5 +23,5 @@ class OffsetDateTimeColumnType :
 fun Table.offsetDateTime(name: String): Column<OffsetDateTime> =
     registerColumn(name, OffsetDateTimeColumnType())
 
-object CurrentOffsetDateTime :
-    CurrentTimestampBase<OffsetDateTime>(OffsetDateTimeColumnType.INSTANCE)
+class CurrentOffsetDateTime(includeUpdate: Boolean = false) :
+    CurrentTimestampBase<OffsetDateTime>(OffsetDateTimeColumnType.INSTANCE, includeUpdate)

src/main/kotlin/dev/slne/surf/database/columns/time/UtcInstantDateTimeColumnType.kt

@@ -162,11 +162,16 @@ abstract class UtcInstantDateTimeColumnType<T : Any> :
     }
 }
 
-open class CurrentTimestampBase<T>(columnType: IColumnType<T & Any>) : Function<T>(columnType) {
+open class CurrentTimestampBase<T>(
+    columnType: IColumnType<T & Any>,
+    private val includeUpdate: Boolean = false
+) : Function<T>(columnType) {
     override fun toQueryBuilder(queryBuilder: QueryBuilder) = queryBuilder {
         +when {
-            (currentDialect as? MysqlDialect)?.isFractionDateTimeSupported() == true -> "CURRENT_TIMESTAMP(6)"
-            else -> "CURRENT_TIMESTAMP"
+            (currentDialect as? MysqlDialect)?.isFractionDateTimeSupported() == true -> "CURRENT_TIMESTAMP(6) ${
+                if (includeUpdate) "ON UPDATE CURRENT_TIMESTAMP(6)" else ""
+            }"
+            else -> "CURRENT_TIMESTAMP ${if (includeUpdate) "ON UPDATE CURRENT_TIMESTAMP" else ""}"
         }
     }
 }

src/main/kotlin/dev/slne/surf/database/columns/time/ZonedDateTimeColumnType.kt

@@ -3,6 +3,7 @@ package dev.slne.surf.database.columns.time
 import org.jetbrains.exposed.v1.core.Column
 import org.jetbrains.exposed.v1.core.Table
 import java.time.Instant
+import java.time.OffsetDateTime
 import java.time.ZoneId
 import java.time.ZonedDateTime
 
@@ -23,5 +24,5 @@ class ZonedDateTimeColumnType :
 fun Table.zonedDateTime(name: String): Column<ZonedDateTime> =
     registerColumn(name, ZonedDateTimeColumnType())
 
-object CurrentZonedDateTime :
-    CurrentTimestampBase<ZonedDateTime>(ZonedDateTimeColumnType.INSTANCE)
+class CurrentZonedDateTime(includeUpdate: Boolean = false):
+    CurrentTimestampBase<ZonedDateTime>(ZonedDateTimeColumnType.INSTANCE, includeUpdate)

src/main/kotlin/dev/slne/surf/database/table/AuditableLongIdTable.kt

@@ -1,13 +1,13 @@
 package dev.slne.surf.database.table
 
+import dev.slne.surf.database.columns.time.CurrentOffsetDateTime
+import dev.slne.surf.database.columns.time.offsetDateTime
 import org.jetbrains.exposed.v1.core.dao.id.ULongIdTable
-import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
-import org.jetbrains.exposed.v1.javatime.timestamp
 
 open class AuditableLongIdTable(name: String = "") : ULongIdTable(name) {
-    val createdAt = timestamp("created_at")
-        .defaultExpression(CurrentTimestamp)
-    val updatedAt = timestamp("updated_at")
-        .defaultExpression(CurrentTimestamp)
+    val createdAt = offsetDateTime("created_at")
+        .defaultExpression(CurrentOffsetDateTime())
+    val updatedAt = offsetDateTime("updated_at")
+        .defaultExpression(CurrentOffsetDateTime(true))
 }