From 2ae6742cd570ad722f6749d676b2d266c5cdef96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Wed, 18 Aug 2021 15:31:12 +0200 Subject: [PATCH] use datetime --- src/main/kotlin/api/ApiObject.kt | 4 ++-- src/main/kotlin/database/dao/SampleObjects.kt | 8 ++++---- src/main/kotlin/database/service/SampleObjectService.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/api/ApiObject.kt b/src/main/kotlin/api/ApiObject.kt index 5baf6b1..f9ae6ff 100644 --- a/src/main/kotlin/api/ApiObject.kt +++ b/src/main/kotlin/api/ApiObject.kt @@ -1,11 +1,11 @@ package api -import kotlinx.datetime.LocalDate +import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable data class ApiObject( val tag: String, val device_id: Int, - val device_date: LocalDate + val device_date: LocalDateTime ) \ No newline at end of file diff --git a/src/main/kotlin/database/dao/SampleObjects.kt b/src/main/kotlin/database/dao/SampleObjects.kt index 5145df1..e2a40e8 100644 --- a/src/main/kotlin/database/dao/SampleObjects.kt +++ b/src/main/kotlin/database/dao/SampleObjects.kt @@ -2,13 +2,13 @@ package database.dao import org.jetbrains.exposed.dao.id.IntIdTable import org.jetbrains.exposed.sql.* -import org.jetbrains.exposed.sql.`java-time`.date -import java.time.LocalDate +import org.jetbrains.exposed.sql.`java-time`.datetime +import java.time.LocalDateTime object SampleObjects : IntIdTable() { val tag: Column = varchar("tag", 32) - val timestamp: Column = date("timestamp").default(LocalDate.now()) + val timestamp: Column = datetime("timestamp").default(LocalDateTime.now()) val device_id: Column = integer("device_id") - val device_date: Column = date("device_date") + val device_date: Column = datetime("device_date") override val primaryKey = PrimaryKey(id, name = "PK_SampleObject_Id") } \ No newline at end of file diff --git a/src/main/kotlin/database/service/SampleObjectService.kt b/src/main/kotlin/database/service/SampleObjectService.kt index 1c0b037..818035e 100644 --- a/src/main/kotlin/database/service/SampleObjectService.kt +++ b/src/main/kotlin/database/service/SampleObjectService.kt @@ -2,7 +2,7 @@ package database.service import database.model.SampleObject import api.ApiObject -import kotlinx.datetime.toJavaLocalDate +import kotlinx.datetime.toJavaLocalDateTime import org.jetbrains.exposed.sql.transactions.transaction class SampleObjectService : ISampleObjectService { @@ -11,7 +11,7 @@ class SampleObjectService : ISampleObjectService { transaction { SampleObject.new { tag = apiObject.tag - device_date = apiObject.device_date.toJavaLocalDate() + device_date = apiObject.device_date.toJavaLocalDateTime() device_id = apiObject.device_id } }