Reorganizing packages in SERDHA schema and minor fixes
This commit is contained in:
parent
bba9b6a43f
commit
1f6abcb8e1
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "storage-serdha/serdha-0-api"]
|
||||||
|
path = storage-serdha/serdha-0-api
|
||||||
|
url = https://git.landgrafhomyak.ru/SERDHA/serdha-0-api.kt.git
|
@ -15,6 +15,8 @@ plugins {
|
|||||||
kotlin("multiplatform") version "2.0.20"
|
kotlin("multiplatform") version "2.0.20"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val serdhaVersion: String by project
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://maven.landgrafhomyak.ru/")
|
maven("https://maven.landgrafhomyak.ru/")
|
||||||
@ -27,7 +29,7 @@ kotlin {
|
|||||||
sourceSets {
|
sourceSets {
|
||||||
commonMain {
|
commonMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("ru.landgrafhomyak.db.serdha:serdha-0-api:0.0")
|
compileOnly("ru.landgrafhomyak.db.serdha:serdha-0-api:$serdhaVersion")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ import ru.landgrafhomyak.bgtu.db0.storage.serdha.schema.v0.M_V0
|
|||||||
import ru.landgrafhomyak.db.serdha0.api.module.ModuleTemplate
|
import ru.landgrafhomyak.db.serdha0.api.module.ModuleTemplate
|
||||||
|
|
||||||
class Module private constructor(context: ModuleTemplate.VersionsInitializer.Scope) {
|
class Module private constructor(context: ModuleTemplate.VersionsInitializer.Scope) {
|
||||||
val v0 = context.createTemplate("v0", M_V0)
|
val v0 = context.createTemplate(M_V0)
|
||||||
|
|
||||||
companion object Initializer : ModuleTemplate.VersionsInitializer<Module> {
|
companion object Initializer : ModuleTemplate.VersionsInitializer<Module> {
|
||||||
override fun createModuleTemplates(context: ModuleTemplate.VersionsInitializer.Scope) =
|
override fun createModuleTemplates(context: ModuleTemplate.VersionsInitializer.Scope) =
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
package ru.landgrafhomyak.bgtu.db0.storage.serdha.schema._temp
|
package ru.landgrafhomyak.bgtu.db0.storage.serdha.schema._temp
|
||||||
|
|
||||||
|
import kotlin.jvm.JvmName
|
||||||
import ru.landgrafhomyak.db.serdha0.api.queries.SelectQuery
|
import ru.landgrafhomyak.db.serdha0.api.queries.SelectQuery
|
||||||
|
|
||||||
internal inline fun <qUE : Any, tUE : Any> SelectQuery.Folding.Constructor.Scope<qUE, tUE>.COUNT() =
|
internal inline fun <qUE : Any, tUE : Any> SelectQuery.Folding.Constructor.Scope<qUE, tUE>.COUNT() =
|
@ -0,0 +1,14 @@
|
|||||||
|
@file:JvmName("VirtualTypesKt")
|
||||||
|
|
||||||
|
package ru.landgrafhomyak.bgtu.db0.storage.serdha.schema._temp
|
||||||
|
|
||||||
|
import kotlin.jvm.JvmName
|
||||||
|
import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType
|
||||||
|
|
||||||
|
inline val DatabaseType.Provider.U8 get() = U8(this)
|
||||||
|
|
||||||
|
inline val DatabaseType.Provider.U64 get() = U64(this)
|
||||||
|
|
||||||
|
inline val DatabaseType.Provider.S64 get() = S64(this)
|
||||||
|
|
||||||
|
inline val DatabaseType.Provider.STRING get() = STRING(this)
|
@ -13,6 +13,8 @@ class M_V0 private constructor(context: CreateModuleScope) {
|
|||||||
val moderators = context.createTable(context.rootNs, "moderators", T_Moderators(this.users, this.chats))
|
val moderators = context.createTable(context.rootNs, "moderators", T_Moderators(this.users, this.chats))
|
||||||
|
|
||||||
companion object Constructor : ModuleTemplate.ModuleConstructor<M_V0> {
|
companion object Constructor : ModuleTemplate.ModuleConstructor<M_V0> {
|
||||||
|
override val versionKey: String get() = "v0"
|
||||||
|
|
||||||
override fun createSchema(context: CreateModuleScope) = M_V0(context)
|
override fun createSchema(context: CreateModuleScope) = M_V0(context)
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,13 +0,0 @@
|
|||||||
@file:JvmName("VirtualTypesKt")
|
|
||||||
|
|
||||||
package ru.landgrafhomyak.bgtu.db0.storage.serdha.schema._temp
|
|
||||||
|
|
||||||
import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType
|
|
||||||
|
|
||||||
internal inline val DatabaseType.Provider.U8 get() = U8(this)
|
|
||||||
|
|
||||||
internal inline val DatabaseType.Provider.U64 get() = U64(this)
|
|
||||||
|
|
||||||
internal inline val DatabaseType.Provider.S64 get() = S64(this)
|
|
||||||
|
|
||||||
internal inline val DatabaseType.Provider.STRING get() = STRING(this)
|
|
@ -1 +1 @@
|
|||||||
Subproject commit bb25b2be726a75fb6ee8bc792475ee64bcbae1c9
|
Subproject commit 8961cea200b07b87a84c294a044289a62244043f
|
Loading…
Reference in New Issue
Block a user