Skip to content

Commit

Permalink
Merge pull request #413 from Drill4J/fix/created-at-columns-null
Browse files Browse the repository at this point in the history
fix: change `nullable` to `defaultExpression` for `createdAt` columns
  • Loading branch information
RomanDavlyatshin authored Feb 5, 2025
2 parents 0ff4d2c + 60f3817 commit 05d40a9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
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") {
val groupId = varchar("group_id", SHORT_TEXT_LENGTH)
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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -29,5 +30,5 @@ object TestDefinitionTable : StringIdTable("raw_data.test_definitions") {
val path = varchar("path", MEDIUM_TEXT_LENGTH).nullable()
val tags = array<String>("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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
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") {
val groupId = varchar("group_id", SHORT_TEXT_LENGTH)
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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

0 comments on commit 05d40a9

Please sign in to comment.