From 60f3817068dd9f56f01a03a1a8bf63249ef64e61 Mon Sep 17 00:00:00 2001 From: iryabov Date: Wed, 5 Feb 2025 10:51:13 +0100 Subject: [PATCH] fix: change `nullable` to `defaultExpression` for `createdAt` columns --- .../com/epam/drill/admin/writer/rawdata/table/BuildTable.kt | 3 ++- .../com/epam/drill/admin/writer/rawdata/table/CoverageTable.kt | 3 ++- .../com/epam/drill/admin/writer/rawdata/table/InstanceTable.kt | 3 ++- .../com/epam/drill/admin/writer/rawdata/table/MethodTable.kt | 3 ++- .../drill/admin/writer/rawdata/table/TestDefinitionTable.kt | 3 ++- .../epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt | 3 ++- .../epam/drill/admin/writer/rawdata/table/TestSessionTable.kt | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/BuildTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/BuildTable.kt index 8c8764a9..e123302f 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/BuildTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/BuildTable.kt @@ -15,6 +15,7 @@ */ package com.epam.drill.admin.writer.rawdata.table +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime object BuildTable : StringIdTable("raw_data.builds") { @@ -27,5 +28,5 @@ object BuildTable : StringIdTable("raw_data.builds") { val commitDate = varchar("commit_date", SHORT_TEXT_LENGTH).nullable() val commitAuthor = varchar("commit_author", SHORT_TEXT_LENGTH).nullable() val commitMessage = varchar("commit_message", SHORT_TEXT_LENGTH).nullable() - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } \ No newline at end of file diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/CoverageTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/CoverageTable.kt index 5c8abdd6..fd0b10b9 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/CoverageTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/CoverageTable.kt @@ -17,6 +17,7 @@ package com.epam.drill.admin.writer.rawdata.table import com.epam.drill.admin.writer.rawdata.config.ProbesColumnType import org.jetbrains.exposed.dao.id.IntIdTable +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime object CoverageTable : IntIdTable("raw_data.coverage") { @@ -26,5 +27,5 @@ object CoverageTable : IntIdTable("raw_data.coverage") { val classname = varchar("classname", LONG_TEXT_LENGTH) val testId = varchar("test_id", SHORT_TEXT_LENGTH) val probes = registerColumn("probes", ProbesColumnType()) - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } \ No newline at end of file diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/InstanceTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/InstanceTable.kt index 0504da02..45b6af25 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/InstanceTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/InstanceTable.kt @@ -15,6 +15,7 @@ */ package com.epam.drill.admin.writer.rawdata.table +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime object InstanceTable : StringIdTable("raw_data.instances", "id") { @@ -22,5 +23,5 @@ object InstanceTable : StringIdTable("raw_data.instances", "id") { val appId = varchar("app_id", SHORT_TEXT_LENGTH) val buildId = (varchar("build_id", MEDIUM_TEXT_LENGTH).references(BuildTable.id)).nullable() val envId = varchar("env_id", MEDIUM_TEXT_LENGTH).nullable() - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/MethodTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/MethodTable.kt index c170e27b..90566eb8 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/MethodTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/MethodTable.kt @@ -15,6 +15,7 @@ */ package com.epam.drill.admin.writer.rawdata.table +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime object MethodTable : StringIdTable("raw_data.methods") { @@ -31,5 +32,5 @@ object MethodTable : StringIdTable("raw_data.methods") { val probesStartPos = integer("probe_start_pos") val annotations = varchar("annotations", LONG_TEXT_LENGTH).nullable() val classAnnotations = varchar("class_annotations", LONG_TEXT_LENGTH).nullable() - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestDefinitionTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestDefinitionTable.kt index 43b44a7c..494b8d92 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestDefinitionTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestDefinitionTable.kt @@ -18,6 +18,7 @@ package com.epam.drill.admin.writer.rawdata.table import kotlinx.serialization.builtins.MapSerializer import kotlinx.serialization.builtins.serializer import kotlinx.serialization.json.Json +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime import org.jetbrains.exposed.sql.json.json @@ -29,5 +30,5 @@ object TestDefinitionTable : StringIdTable("raw_data.test_definitions") { val path = varchar("path", MEDIUM_TEXT_LENGTH).nullable() val tags = array("tags", MEDIUM_TEXT_LENGTH).nullable() val metadata = json("metadata", Json, MapSerializer(String.serializer(), String.serializer())).nullable() - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } \ No newline at end of file diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt index 731c5928..5fcb2f95 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt @@ -15,6 +15,7 @@ */ package com.epam.drill.admin.writer.rawdata.table +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime object TestLaunchTable : StringIdTable("raw_data.test_launches") { @@ -22,5 +23,5 @@ object TestLaunchTable : StringIdTable("raw_data.test_launches") { val testDefinitionId = varchar("test_definition_id", SHORT_TEXT_LENGTH) val testSessionId = varchar("test_session_id", SHORT_TEXT_LENGTH) val result = varchar("result", SHORT_TEXT_LENGTH).nullable() - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestSessionTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestSessionTable.kt index df794ca8..8e678dbe 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestSessionTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestSessionTable.kt @@ -15,11 +15,12 @@ */ package com.epam.drill.admin.writer.rawdata.table +import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime object TestSessionTable : StringIdTable("raw_data.test_sessions") { val groupId = varchar("group_id", SHORT_TEXT_LENGTH) val testTaskId = varchar("test_task_id", SHORT_TEXT_LENGTH).nullable() val startedAt = datetime("started_at") - val createdAt = datetime("created_at").nullable() + val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } \ No newline at end of file