feature: Better serializable column

TriumphTeam · Oct 4, 2023 · 303d1b4 · 303d1b4
1 parent 7989fdd
commit 303d1b4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 46 deletions.
diff --git a/app/src/main/kotlin/database/Tables.kt b/app/src/main/kotlin/database/Tables.kt
diff --git a/app/src/main/kotlin/database/entity/DocsEntity.kt b/app/src/main/kotlin/database/entity/DocsEntity.kt
@@ -0,0 +1,27 @@
+package dev.triumphteam.docsly.database.entity
+
+import dev.triumphteam.docsly.database.exposed.serializable
+import dev.triumphteam.docsly.serializable.DocElement
+import org.jetbrains.exposed.dao.LongEntity
+import org.jetbrains.exposed.dao.LongEntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.IdTable
+import org.jetbrains.exposed.sql.Column
+
+public object DocsTable : IdTable<Long>() {
+ public val guild: Column<Long> = long("guild_id").uniqueIndex()
+ public val project: Column<String> = text("project").uniqueIndex()
+ public val version: Column<String> = text("version").uniqueIndex()
+ public val location: Column<String> = text("location").uniqueIndex()
+ public val doc: Column<DocElement> = serializable("doc")
+
+ override val primaryKey: PrimaryKey = PrimaryKey(guild, version, location)
+ override val id: Column<EntityID<Long>> = guild.entityId()
+}
+
+public class DocEntity(entityId: EntityID<Long>) : LongEntity(entityId) {
+ public companion object : LongEntityClass<DocEntity>(DocsTable)
+
+ public var version: String by DocsTable.version
+ public var guild: Long by DocsTable.guild
+}
diff --git a/app/src/main/kotlin/database/exposed/SerializableColumn.kt b/app/src/main/kotlin/database/exposed/SerializableColumn.kt
@@ -27,16 +27,20 @@ import com.impossibl.postgres.jdbc.PGArray
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.serializer
 import org.jetbrains.exposed.sql.Column
 import org.jetbrains.exposed.sql.Table
 import org.jetbrains.exposed.sql.TextColumnType
 import java.sql.Clob
 import kotlin.reflect.KClass
 
-private val json = Json
+public val json: Json = Json
 
 public inline fun <reified T : Any> Table.serializable(name: String, serializer: KSerializer<T>): Column<T> =
- registerColumn<T>(name, SerializableColumnType(T::class, serializer))
+ registerColumn(name, SerializableColumnType(T::class, serializer))
+
+public inline fun <reified T : Any> Table.serializable(name: String): Column<T> =
+ registerColumn(name, SerializableColumnType(T::class, json.serializersModule.serializer()))
 
 @Suppress("UNCHECKED_CAST")
 public class SerializableColumnType<T : Any>(