From 757a8442f2b244d9147def1409b2c41e701c233e Mon Sep 17 00:00:00 2001 From: Andrew Golovashevich Date: Sat, 22 Feb 2025 20:47:12 +0300 Subject: [PATCH] Executor now accessible from module --- .../ru/landgrafhomyak/db/serdha0/api/module/Module.kt | 8 ++------ .../landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt | 2 +- .../landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt index 2b430c6..e54be78 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt @@ -21,12 +21,8 @@ public interface Module { @Suppress("INAPPLICABLE_JVM_NAME") @get:JvmName("versionKey") public val versionKey: String -/* - @Suppress("INAPPLICABLE_JVM_NAME") - @get:JvmName("ownerDatabase") - public val ownerDatabase: Executor -*/ - public fun createQuery(c: _Query.Constructor): R + + public val executor: Executor } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt index 77f6fb0..67a25cd 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt @@ -54,7 +54,7 @@ public interface DeleteQuery : _Query { public fun > queryParam(name: String, type: DT): QueryParam public val selectorParams: InputRow.WithRedirect - public val selectorColumn: Column, DatabaseType.ROW_ID, sUE> + public var selectorColumn: Column, DatabaseType.ROW_ID, sUE> public fun > returnFromSubquery(name: String, column: Column): Column public fun > returnRemovedValue(name: String, column: Column): Column diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt index c398ea3..6e30952 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt @@ -57,7 +57,7 @@ public interface UpdateQuery : _Query { public fun > queryParam(name: String, type: DT): QueryParam public val selectorParams: InputRow.WithRedirect - public val selectorColumn: Column, DatabaseType.ROW_ID, sUE> + public var selectorColumn: Column, DatabaseType.ROW_ID, sUE> public fun > updateColumnWithSubquery(dst: Column, src: Column) public fun > updateColumnWithOldValue(dst: Column, src: Column)