forked from SteamWar/SteamWar
Refactor NodeDataTable to use default current timestamp for createdAt and ensure schemData reads blob as bytes.
Signed-off-by: Chaoscaot <max@maxsp.de>
This commit is contained in:
@@ -21,7 +21,6 @@ package de.steamwar.sql
|
|||||||
|
|
||||||
import de.steamwar.sql.internal.useDb
|
import de.steamwar.sql.internal.useDb
|
||||||
import org.jetbrains.exposed.v1.core.SortOrder
|
import org.jetbrains.exposed.v1.core.SortOrder
|
||||||
import org.jetbrains.exposed.v1.core.blobParam
|
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.CompositeID
|
import org.jetbrains.exposed.v1.core.dao.id.CompositeID
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
|
import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
||||||
@@ -29,6 +28,7 @@ import org.jetbrains.exposed.v1.core.eq
|
|||||||
import org.jetbrains.exposed.v1.core.statements.api.ExposedBlob
|
import org.jetbrains.exposed.v1.core.statements.api.ExposedBlob
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
|
import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
|
||||||
import org.jetbrains.exposed.v1.javatime.timestamp
|
import org.jetbrains.exposed.v1.javatime.timestamp
|
||||||
import org.jetbrains.exposed.v1.jdbc.insert
|
import org.jetbrains.exposed.v1.jdbc.insert
|
||||||
import java.io.InputStream
|
import java.io.InputStream
|
||||||
@@ -36,7 +36,7 @@ import java.util.zip.GZIPInputStream
|
|||||||
|
|
||||||
object NodeDataTable: CompositeIdTable("NodeData") {
|
object NodeDataTable: CompositeIdTable("NodeData") {
|
||||||
val nodeId = reference("NodeId", SchematicNodeTable)
|
val nodeId = reference("NodeId", SchematicNodeTable)
|
||||||
val createdAt = timestamp("CreatedAt").entityId()
|
val createdAt = timestamp("CreatedAt").defaultExpression(CurrentTimestamp).entityId()
|
||||||
val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
|
val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
|
||||||
val schemData = blob("SchemData")
|
val schemData = blob("SchemData")
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ class NodeData(id: EntityID<CompositeID>): CompositeEntity(id) {
|
|||||||
NodeDataTable.insert {
|
NodeDataTable.insert {
|
||||||
it[NodeDataTable.nodeId] = EntityID(node.getId(), SchematicNodeTable)
|
it[NodeDataTable.nodeId] = EntityID(node.getId(), SchematicNodeTable)
|
||||||
it[NodeDataTable.nodeFormat] = format
|
it[NodeDataTable.nodeFormat] = format
|
||||||
it[NodeDataTable.schemData] = ExposedBlob(blob)
|
it[NodeDataTable.schemData] = ExposedBlob(blob.readBytes())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user