From 60d57c3656eaeab5210d13181a3237e340c5236c Mon Sep 17 00:00:00 2001 From: Andrew Golovashevich Date: Mon, 12 May 2025 09:42:28 +0300 Subject: [PATCH] Generics naming --- .../db/skeleton1/api/module/Module.kt | 6 +- .../api/module/ModuleConstructorScope.kt | 24 ++--- .../api/module/ModuleScopedObject.kt | 6 +- .../api/module/ModuleUpgradeScope.kt | 102 +++++++++--------- .../db/skeleton1/api/module/Namespace.kt | 4 +- .../db/skeleton1/api/runtime/Executor.kt | 4 +- .../db/skeleton1/api/runtime/InputRow.kt | 24 ++--- .../db/skeleton1/api/runtime/OutputRow.kt | 25 +++-- .../db/skeleton1/api/runtime/Transaction.kt | 20 ++-- .../db/skeleton1/api/statement/InputParam.kt | 4 +- .../skeleton1/api/statement/OutputColumn.kt | 4 +- .../api/statement/QueriesCompiler.kt | 18 ++-- .../skeleton1/api/statement/RawStatement.kt | 52 ++++----- .../db/skeleton1/api/statement/_Statement.kt | 20 ++-- .../db/skeleton1/api/table/Column.kt | 6 +- .../db/skeleton1/api/table/Table.kt | 6 +- .../api/table/TableConstructorScope.kt | 14 +-- .../skeleton1/api/table/TableScopedObject.kt | 4 +- .../skeleton1/api/table/TableUpgradeScope.kt | 35 +++--- 19 files changed, 188 insertions(+), 190 deletions(-) diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt index 2a8a905..1ddd908 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt @@ -7,7 +7,7 @@ import ru.landgrafhomyak.db.skeleton1.api.statement.QueriesCompiler import ru.landgrafhomyak.db.skeleton1.api.runtime.Transaction -public interface Module { +public interface Module { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("uExt") public val uExt: mUE @@ -20,7 +20,7 @@ public interface Module { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getParent") - public val parent: Module<*, RUNTIME_KEY>? + public val parent: Module<*, IK>? public interface Constructor { @Suppress("INAPPLICABLE_JVM_NAME") @@ -32,7 +32,7 @@ public interface Module { public suspend fun initData(ext: mUE, compiler: QueriesCompiler, transaction: Transaction) {} } - public interface Upgrade { + public interface Upgrade { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("versionKey") public val versionKey: String diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleConstructorScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleConstructorScope.kt index 081b037..4a9435f 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleConstructorScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleConstructorScope.kt @@ -9,32 +9,32 @@ import ru.landgrafhomyak.db.skeleton1.api.table.Table import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow -public interface ModuleConstructorScope { +public interface ModuleConstructorScope { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("rootNs") - public val rootNs: Namespace + public val rootNs: Namespace public fun createTable( lifeTime: Table.LifeTime = Table.LifeTime.DATABASE_SCOPE, - namespace: Namespace = this.rootNs, - name: String, initializer: Table.Constructor - ): Table + namespace: Namespace = this.rootNs, + name: String, initializer: Table.Constructor + ): Table public fun moduleScopedObject( - namespace: Namespace = this.rootNs, + namespace: Namespace = this.rootNs, name: String, metadata: ObjectOperations.ImplementationsProvider - ): ModuleScopedObject + ): ModuleScopedObject - public fun substituteModule(rootNs: Namespace, template: Module.Template): Module + public fun substituteModule(rootNs: Namespace, template: Module.Template): Module - public fun namespace(parent: Namespace, name: String): Namespace + public fun namespace(parent: Namespace, name: String): Namespace - public fun addStatement(stmt: _Statement.Void2Void<*, RK>) + public fun addStatement(stmt: _Statement.Void2Void<*, IK>) public fun addStatement(stmt: RawStatement.Void2Void.ImplementationsProvider<*>) @LowLevelApi - public fun _addStatement(stmt: _Statement.Params2Void): InputRow._Scope + public fun _addStatement(stmt: _Statement.Params2Void): InputRow._Scope @LowLevelApi - public fun _addStatement(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope + public fun _addStatement(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt index 8314cfd..b8c125e 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt @@ -2,15 +2,15 @@ package ru.landgrafhomyak.db.skeleton1.api.module import ru.landgrafhomyak.db.skeleton1.api.DebugApi -public interface ModuleScopedObject { +public interface ModuleScopedObject { public val uExt: oUE @DebugApi public val name: String @DebugApi - public val module: Module + public val module: Module @DebugApi - public val namespace: Namespace + public val namespace: Namespace } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleUpgradeScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleUpgradeScope.kt index bc3b01a..11651fa 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleUpgradeScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleUpgradeScope.kt @@ -7,94 +7,94 @@ import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow import ru.landgrafhomyak.db.skeleton1.api.table.Table -public interface ModuleUpgradeScope : ModuleConstructorScope { +public interface ModuleUpgradeScope : ModuleConstructorScope { // Table ------------------------------------------------------------------- - public fun keepTable(table: Table): Table + public fun keepTable(table: Table): Table public fun keepAndRenameTable( - table: Table, - newNamespace: Namespace? = null, newName: String - ): Table + table: Table, + newNamespace: Namespace? = null, newName: String + ): Table public fun upgradeTable( - oldTable: Table, - upgrade: Table.Upgrade - ): Table + oldTable: Table, + upgrade: Table.Upgrade + ): Table public fun upgradeAndRenameTable( - table: Table, - newNamespace: Namespace? = null, newName: String, - upgrade: Table.Upgrade - ): Table + table: Table, + newNamespace: Namespace? = null, newName: String, + upgrade: Table.Upgrade + ): Table - public fun deleteTable(table: Table<*, omUE, RK>) - public fun deleteTableAfterModuleUpgrade(table: Table): Table + public fun deleteTable(table: Table<*, omUE, IK>) + public fun deleteTableAfterModuleUpgrade(table: Table): Table - public fun exportTable(table: Table<*, omUE, RK>) + public fun exportTable(table: Table<*, omUE, IK>) public fun importTable( - table: Table, - namespace: Namespace = this.rootNs, name: String - ): Table + table: Table, + namespace: Namespace = this.rootNs, name: String + ): Table public fun importAndUpgradeTable( - table: Table, - namespace: Namespace = this.rootNs, name: String, - upgrade: Table.Upgrade - ): Table + table: Table, + namespace: Namespace = this.rootNs, name: String, + upgrade: Table.Upgrade + ): Table // Object ------------------------------------------------------------------ - public fun keepModuleScopedObject(obj: ModuleScopedObject): ModuleScopedObject + public fun keepModuleScopedObject(obj: ModuleScopedObject): ModuleScopedObject public fun renameModuleScopedObject( - obj: ModuleScopedObject, - newNamespace: Namespace? = null, newName: String - ): ModuleScopedObject + obj: ModuleScopedObject, + newNamespace: Namespace? = null, newName: String + ): ModuleScopedObject - public fun deleteModuleScopedObject(obj: ModuleScopedObject) - public fun deleteModuleScopedObjectAfterModuleUpgrade(obj: ModuleScopedObject): ModuleScopedObject + public fun deleteModuleScopedObject(obj: ModuleScopedObject) + public fun deleteModuleScopedObjectAfterModuleUpgrade(obj: ModuleScopedObject): ModuleScopedObject - public fun exportModuleScopedObject(obj: ModuleScopedObject<*, omUE, RK>) + public fun exportModuleScopedObject(obj: ModuleScopedObject<*, omUE, IK>) public fun importModuleScopedObject( - obj: ModuleScopedObject, - namespace: Namespace = this.rootNs, name: String - ): ModuleScopedObject + obj: ModuleScopedObject, + namespace: Namespace = this.rootNs, name: String + ): ModuleScopedObject // Module ------------------------------------------------------------------ - public fun keepModule(module: Module): Module - public fun keepAndMoveModule(oldModule: Module, newNs: Namespace): Module + public fun keepModule(module: Module): Module + public fun keepAndMoveModule(oldModule: Module, newNs: Namespace): Module - public fun upgradeModule(oldModule: Module<*, RK>, template: Module.Template): Module + public fun upgradeModule(oldModule: Module<*, IK>, template: Module.Template): Module public fun upgradeAndMoveModule( - oldModule: Module<*, RK>, - newNamespace: Namespace, + oldModule: Module<*, IK>, + newNamespace: Namespace, template: Module.Template - ): Module + ): Module - public fun deleteModule(oldModule: Module<*, RK>) - public fun deleteModuleAfterUpgrade(oldModule: Module): Module + public fun deleteModule(oldModule: Module<*, IK>) + public fun deleteModuleAfterUpgrade(oldModule: Module): Module - public fun exportModule(table: Module<*, RK>) + public fun exportModule(table: Module<*, IK>) public fun importModule( - module: Module, - namespace: Namespace, - ): Module + module: Module, + namespace: Namespace, + ): Module public fun importAndUpgradeModule( - module: Module, - namespace: Namespace, - upgrade: Module.Upgrade - ): Module + module: Module, + namespace: Namespace, + upgrade: Module.Upgrade + ): Module // Statements -------------------------------------------------------------- - public fun addStatementAfterUpgrade(stmt: _Statement.Void2Void<*, RK>) + public fun addStatementAfterUpgrade(stmt: _Statement.Void2Void<*, IK>) public fun addStatementAfterUpgrade(stmt: RawStatement.Void2Void.ImplementationsProvider<*>) @LowLevelApi - public fun _addStatementAfterUpgrade(stmt: _Statement.Params2Void): InputRow._Scope + public fun _addStatementAfterUpgrade(stmt: _Statement.Params2Void): InputRow._Scope @LowLevelApi - public fun _addStatementAfterUpgrade(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope + public fun _addStatementAfterUpgrade(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt index 5de4652..070ba97 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt @@ -3,7 +3,7 @@ package ru.landgrafhomyak.db.skeleton1.api.module import kotlin.jvm.JvmName import ru.landgrafhomyak.db.skeleton1.api.DebugApi -public interface Namespace { +public interface Namespace { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getName") @@ -15,5 +15,5 @@ public interface Namespace { public val path: List @DebugApi - public val module: Module + public val module: Module } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt index 30d1b82..5f58031 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt @@ -2,8 +2,8 @@ package ru.landgrafhomyak.db.skeleton1.api.runtime import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi -public interface Executor { +public interface Executor { @Suppress("FunctionName") @LowLevelApi - public suspend fun _startTransaction(): Transaction + public suspend fun _startTransaction(): Transaction } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt index a54483d..11f56f7 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt @@ -4,23 +4,23 @@ import kotlin.jvm.JvmName import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi import ru.landgrafhomyak.db.skeleton1.api.statement.InputParam -public interface InputRow { +public interface InputRow { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("uExt") public val uExt: qUE - public operator fun set(c: InputParam, value: RuntimeType) + public operator fun set(c: InputParam, value: RuntimeType) - public operator fun set(c: InputParam, value: Byte): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: UByte): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: Short): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: UShort): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: Int): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: UInt): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: Long): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: ULong): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: Char): Unit = this.set(c, value) - public operator fun set(c: InputParam, value: Boolean): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: Byte): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: UByte): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: Short): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: UShort): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: Int): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: UInt): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: Long): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: ULong): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: Char): Unit = this.set(c, value) + public operator fun set(c: InputParam, value: Boolean): Unit = this.set(c, value) @Suppress("ClassName") @LowLevelApi diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt index 5a6812f..4574e1e 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt @@ -3,25 +3,24 @@ package ru.landgrafhomyak.db.skeleton1.api.runtime import kotlin.jvm.JvmName import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi import ru.landgrafhomyak.db.skeleton1.api.statement.OutputColumn -import ru.landgrafhomyak.db.skeleton1.api.table.Column -public interface OutputRow { +public interface OutputRow { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("uExt") public val uExt: qUE - public operator fun get(c: OutputColumn): RuntimeType + public operator fun get(c: OutputColumn): RuntimeType - public operator fun get(c: OutputColumn): Byte = this.get(c) - public operator fun get(c: OutputColumn): UByte = this.get(c) - public operator fun get(c: OutputColumn): Short = this.get(c) - public operator fun get(c: OutputColumn): UShort = this.get(c) - public operator fun get(c: OutputColumn): Int = this.get(c) - public operator fun get(c: OutputColumn): UInt = this.get(c) - public operator fun get(c: OutputColumn): Long = this.get(c) - public operator fun get(c: OutputColumn): ULong = this.get(c) - public operator fun get(c: OutputColumn): Char = this.get(c) - public operator fun get(c: OutputColumn): Boolean = this.get(c) + public operator fun get(c: OutputColumn): Byte = this.get(c) + public operator fun get(c: OutputColumn): UByte = this.get(c) + public operator fun get(c: OutputColumn): Short = this.get(c) + public operator fun get(c: OutputColumn): UShort = this.get(c) + public operator fun get(c: OutputColumn): Int = this.get(c) + public operator fun get(c: OutputColumn): UInt = this.get(c) + public operator fun get(c: OutputColumn): Long = this.get(c) + public operator fun get(c: OutputColumn): ULong = this.get(c) + public operator fun get(c: OutputColumn): Char = this.get(c) + public operator fun get(c: OutputColumn): Boolean = this.get(c) @Suppress("ClassName") @LowLevelApi diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt index a284619..c141f85 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt @@ -3,40 +3,40 @@ package ru.landgrafhomyak.db.skeleton1.api.runtime import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi import ru.landgrafhomyak.db.skeleton1.api.statement._Statement -public interface Transaction { - public suspend fun executeQuery_void2void(compiledQuery: _Statement.Void2Void) +public interface Transaction { + public suspend fun executeQuery_void2void(compiledQuery: _Statement.Void2Void) @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_void2row(compiledQuery: _Statement.Void2Row): OutputRow._Scope + public suspend fun _executeQuery_void2row(compiledQuery: _Statement.Void2Row): OutputRow._Scope @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_void2rowOrNull(compiledQuery: _Statement.Void2RowOrNull): OutputRow._Scope? + public suspend fun _executeQuery_void2rowOrNull(compiledQuery: _Statement.Void2RowOrNull): OutputRow._Scope? @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_void2table(compiledQuery: _Statement.Void2RowOrNull): OutputRow._Iterator + public suspend fun _executeQuery_void2table(compiledQuery: _Statement.Void2RowOrNull): OutputRow._Iterator @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_params2void(compiledQuery: _Statement.Void2Void): InputRow._Scope + public suspend fun _executeQuery_params2void(compiledQuery: _Statement.Void2Void): InputRow._Scope @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_params2row(compiledQuery: _Statement.Void2Row): InputRow._Scope> + public suspend fun _executeQuery_params2row(compiledQuery: _Statement.Void2Row): InputRow._Scope> @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_params2rowOrNull(compiledQuery: _Statement.Void2RowOrNull): InputRow._Scope?> + public suspend fun _executeQuery_params2rowOrNull(compiledQuery: _Statement.Void2RowOrNull): InputRow._Scope?> @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeQuery_params2table(compiledQuery: _Statement.Void2RowOrNull): InputRow._Scope> + public suspend fun _executeQuery_params2table(compiledQuery: _Statement.Void2RowOrNull): InputRow._Scope> @Suppress("FunctionName") @LowLevelApi - public suspend fun _executeBatch_params2void(compiledQuery: _Statement.Void2Void): InputRow._Iterator + public suspend fun _executeBatch_params2void(compiledQuery: _Statement.Void2Void): InputRow._Iterator public suspend fun rollback() diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/InputParam.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/InputParam.kt index 34a4176..cae41ee 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/InputParam.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/InputParam.kt @@ -3,7 +3,7 @@ package ru.landgrafhomyak.db.skeleton1.api.statement import kotlin.jvm.JvmName import ru.landgrafhomyak.db.skeleton1.api.DebugApi -public interface InputParam<@Suppress("unused") RT, oqUE : Any, RK : Any> { +public interface InputParam<@Suppress("unused") RT, sUE : Any, IK : Any> { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getName") @@ -12,5 +12,5 @@ public interface InputParam<@Suppress("unused") RT, oqUE : Any, RK : Any> { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getStatement") - public val statement: _Statement + public val statement: _Statement } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/OutputColumn.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/OutputColumn.kt index 94c838f..8c537a6 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/OutputColumn.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/OutputColumn.kt @@ -3,7 +3,7 @@ package ru.landgrafhomyak.db.skeleton1.api.statement import kotlin.jvm.JvmName import ru.landgrafhomyak.db.skeleton1.api.DebugApi -public interface OutputColumn<@Suppress("unused") RT, oqUE : Any, RK : Any> { +public interface OutputColumn<@Suppress("unused") RT, sUE : Any, IK : Any> { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("name") @@ -12,5 +12,5 @@ public interface OutputColumn<@Suppress("unused") RT, oqUE : Any, RK : Any> { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getStatement") - public val statement: _Statement + public val statement: _Statement } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt index 7737e3c..ebfe1d9 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt @@ -1,12 +1,12 @@ package ru.landgrafhomyak.db.skeleton1.api.statement -public interface QueriesCompiler { - public fun raw_void2void(constructor: RawStatement.Void2Void.ImplementationsProvider): RawStatement.Void2Void - public fun raw_void2row(constructor: RawStatement.Void2Row.ImplementationsProvider): RawStatement.Void2Row - public fun raw_void2rowOrNull(constructor: RawStatement.Void2RowOrNull.ImplementationsProvider): RawStatement.Void2RowOrNull - public fun raw_void2table(constructor: RawStatement.Void2Table.ImplementationsProvider): RawStatement.Void2Table - public fun raw_params2void(constructor: RawStatement.Params2Void.ImplementationsProvider): RawStatement.Params2Void - public fun raw_params2row(constructor: RawStatement.Params2Row.ImplementationsProvider): RawStatement.Params2Row - public fun raw_params2rowOrNull(constructor: RawStatement.Params2RowOrNull.ImplementationsProvider): RawStatement.Params2RowOrNull - public fun raw_params2table(constructor: RawStatement.Params2Table.ImplementationsProvider): RawStatement.Params2Table +public interface QueriesCompiler { + public fun raw_void2void(constructor: RawStatement.Void2Void.ImplementationsProvider): RawStatement.Void2Void + public fun raw_void2row(constructor: RawStatement.Void2Row.ImplementationsProvider): RawStatement.Void2Row + public fun raw_void2rowOrNull(constructor: RawStatement.Void2RowOrNull.ImplementationsProvider): RawStatement.Void2RowOrNull + public fun raw_void2table(constructor: RawStatement.Void2Table.ImplementationsProvider): RawStatement.Void2Table + public fun raw_params2void(constructor: RawStatement.Params2Void.ImplementationsProvider): RawStatement.Params2Void + public fun raw_params2row(constructor: RawStatement.Params2Row.ImplementationsProvider): RawStatement.Params2Row + public fun raw_params2rowOrNull(constructor: RawStatement.Params2RowOrNull.ImplementationsProvider): RawStatement.Params2RowOrNull + public fun raw_params2table(constructor: RawStatement.Params2Table.ImplementationsProvider): RawStatement.Params2Table } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt index 7c58421..134a305 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt @@ -2,13 +2,13 @@ package ru.landgrafhomyak.db.skeleton1.api.statement import ru.landgrafhomyak.db.skeleton1.api.DriverMetainfo -public interface RawStatement : _Statement { - public override val uExt: qUE +public interface RawStatement : _Statement { + public override val uExt: sUE - public interface Void2Void : RawStatement, _Statement.Void2Void { - override val uExt: qUE + public interface Void2Void : RawStatement, _Statement.Void2Void { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any?> + public interface Constructor<@Suppress("unused") sUE : Any?> public interface ImplementationsProvider { public fun provideStatementImplementations_void2void(scope: Scope) @@ -25,10 +25,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Void2Row { - override val uExt: qUE + public interface Void2Row : RawStatement, _Statement.Void2Row { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_void2row(scope: Scope) @@ -45,10 +45,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Void2RowOrNull { - override val uExt: qUE + public interface Void2RowOrNull : RawStatement, _Statement.Void2RowOrNull { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_void2rowOrNull(scope: Scope) @@ -66,10 +66,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Void2Table { - override val uExt: qUE + public interface Void2Table : RawStatement, _Statement.Void2Table { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_void2table(selector: Selector) @@ -86,10 +86,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Params2Void { - override val uExt: qUE + public interface Params2Void : RawStatement, _Statement.Params2Void { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_params2void(scope: Scope) @@ -106,10 +106,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Params2Row { - override val uExt: qUE + public interface Params2Row : RawStatement, _Statement.Params2Row { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_params2row(scope: Scope) @@ -126,10 +126,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Params2RowOrNull { - override val uExt: qUE + public interface Params2RowOrNull : RawStatement, _Statement.Params2RowOrNull { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_params2rowOrNull(scope: Scope) @@ -146,10 +146,10 @@ public interface RawStatement : _Statement : RawStatement, _Statement.Params2Table { - override val uExt: qUE + public interface Params2Table : RawStatement, _Statement.Params2Table { + override val uExt: sUE - public interface Constructor<@Suppress("unused") qUE : Any> + public interface Constructor<@Suppress("unused") sUE : Any> public interface ImplementationsProvider { public fun provideStatementImplementations_params2table(scope: Scope) diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt index 957c337..cd9940b 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt @@ -4,17 +4,17 @@ import kotlin.jvm.JvmName @Suppress("ClassName") -public interface _Statement { +public interface _Statement { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("uExt") - public val uExt: STATEMENT_USER_EXTENSION + public val uExt: sUE - public interface Void2Void : _Statement - public interface Void2Row : _Statement - public interface Void2RowOrNull : _Statement - public interface Void2Table : _Statement - public interface Params2Void : _Statement - public interface Params2Row : _Statement - public interface Params2RowOrNull : _Statement - public interface Params2Table : _Statement + public interface Void2Void : _Statement + public interface Void2Row : _Statement + public interface Void2RowOrNull : _Statement + public interface Void2Table : _Statement + public interface Params2Void : _Statement + public interface Params2Row : _Statement + public interface Params2RowOrNull : _Statement + public interface Params2Table : _Statement } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt index 46a1032..e936b91 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt @@ -4,7 +4,7 @@ import kotlin.jvm.JvmName import ru.landgrafhomyak.db.skeleton1.api.DebugApi import ru.landgrafhomyak.db.skeleton1.api.DatabaseType -public interface Column { +public interface Column { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("name") @@ -13,10 +13,10 @@ public interface Column + public val type: DatabaseType @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getTable") - public val table: Table + public val table: Table } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt index 820cdea..6eb896e 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt @@ -5,7 +5,7 @@ import ru.landgrafhomyak.db.skeleton1.api.DebugApi import ru.landgrafhomyak.db.skeleton1.api.module.Module import ru.landgrafhomyak.db.skeleton1.api.module.Namespace -public interface Table { +public interface Table { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("uExt") public val uExt: UE @@ -18,12 +18,12 @@ public interface Table { @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getNamespace") - public val namespace: Namespace + public val namespace: Namespace @DebugApi @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("getModule") - public val module: Module + public val module: Module public enum class LifeTime { DATABASE_SCOPE, diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt index 02e4c45..7f9260d 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt @@ -8,18 +8,18 @@ import ru.landgrafhomyak.db.skeleton1.api.statement._Statement import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow -public interface TableConstructorScope { - public fun column(name: String, type: DatabaseType.ImplementationsProvider, manualCreate: Boolean = false): Column - public fun columnWithBoundType(name: String, foreign: Column): Column +public interface TableConstructorScope { + public fun column(name: String, type: DatabaseType.ImplementationsProvider, manualCreate: Boolean = false): Column + public fun columnWithBoundType(name: String, foreign: Column): Column - public fun tableScopedObject(name: String, metadata: ObjectOperations.ImplementationsProvider): TableScopedObject + public fun tableScopedObject(name: String, metadata: ObjectOperations.ImplementationsProvider): TableScopedObject - public fun addAlterStatement(stmt: _Statement.Void2Void<*, RK>) + public fun addAlterStatement(stmt: _Statement.Void2Void<*, IK>) public fun addAlterStatement(stmt: RawStatement.Void2Void.ImplementationsProvider<*>) @LowLevelApi - public fun _addAlterStatement(stmt: _Statement.Void2Void): InputRow._Scope + public fun _addAlterStatement(stmt: _Statement.Void2Void): InputRow._Scope @LowLevelApi - public fun _addAlterStatement(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope + public fun _addAlterStatement(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt index c2c5863..1f74328 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt @@ -2,12 +2,12 @@ package ru.landgrafhomyak.db.skeleton1.api.table import ru.landgrafhomyak.db.skeleton1.api.DebugApi -public interface TableScopedObject { +public interface TableScopedObject { public val uExt: oUE @DebugApi public val name: String @DebugApi - public val table: Table + public val table: Table } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt index 105607d..5dcfb82 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt @@ -1,34 +1,33 @@ package ru.landgrafhomyak.db.skeleton1.api.table import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi -import ru.landgrafhomyak.db.skeleton1.api.ObjectOperations import ru.landgrafhomyak.db.skeleton1.api.statement.RawStatement import ru.landgrafhomyak.db.skeleton1.api.statement._Statement import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow -public interface TableUpgradeScope : TableConstructorScope { - public fun keepColumn(c: Column): Column - public fun renameColumn(c: Column, newName: String): Column - public fun deleteColumn(c: Column<*, toUE, RK>) - public fun deleteColumnAfterUpgrade(c: Column): Column +public interface TableUpgradeScope : TableConstructorScope { + public fun keepColumn(c: Column): Column + public fun renameColumn(c: Column, newName: String): Column + public fun deleteColumn(c: Column<*, toUE, IK>) + public fun deleteColumnAfterUpgrade(c: Column): Column - public fun keepColumnWithBoundType(c: Column): Column - public fun unbindAndKeepColumnWithBoundType(c: Column): Column - public fun renameColumnWithBoundType(c: Column, newName: String): Column - public fun unbindAndRenameColumnWithBoundType(c: Column, newName: String): Column - public fun deleteColumnWithBoundType(c: Column<*, toUE, RK>) - public fun deleteColumnWithBoundTypeAfterUpgrade(c: Column): Column + public fun keepColumnWithBoundType(c: Column): Column + public fun unbindAndKeepColumnWithBoundType(c: Column): Column + public fun renameColumnWithBoundType(c: Column, newName: String): Column + public fun unbindAndRenameColumnWithBoundType(c: Column, newName: String): Column + public fun deleteColumnWithBoundType(c: Column<*, toUE, IK>) + public fun deleteColumnWithBoundTypeAfterUpgrade(c: Column): Column - public fun keepTableScopedObject(obj: TableScopedObject): TableScopedObject - public fun renameTableScopedObject(obj: TableScopedObject, newName: String): TableScopedObject - public fun deleteTableScopedObject(obj: TableScopedObject): TableScopedObject + public fun keepTableScopedObject(obj: TableScopedObject): TableScopedObject + public fun renameTableScopedObject(obj: TableScopedObject, newName: String): TableScopedObject + public fun deleteTableScopedObject(obj: TableScopedObject): TableScopedObject - public fun addAlterStatementAfterUpgrade(stmt: _Statement.Void2Void<*, RK>) + public fun addAlterStatementAfterUpgrade(stmt: _Statement.Void2Void<*, IK>) public fun addAlterStatementAfterUpgrade(stmt: RawStatement.Void2Void.ImplementationsProvider<*>) @LowLevelApi - public fun _addAlterStatementAfterUpgrade(stmt: _Statement.Params2Void): InputRow._Scope + public fun _addAlterStatementAfterUpgrade(stmt: _Statement.Params2Void): InputRow._Scope @LowLevelApi - public fun _addAlterStatementAfterUpgrade(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope + public fun _addAlterStatementAfterUpgrade(stmt: RawStatement.Params2Void.ImplementationsProvider): InputRow._Scope } \ No newline at end of file