From 712ed06b691279be6fbd80c24b016e78cf9048ea Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 17 Oct 2020 17:41:56 +0600 Subject: [PATCH] exposed tables changes --- repos/exposed/build.gradle | 1 + .../repos/exposed/ColumnAllocator.kt | 6 ++ .../repos/exposed/ExposedCRUDRepo.kt | 4 +- .../micro_utils/repos/exposed/ExposedRepo.kt | 10 ++++ .../exposed/ExposedTableInitialization.kt | 2 + ...KeyValueRepo.kt => ExposedKeyValueRepo.kt} | 18 ++++-- ...alueRepo.kt => ExposedReadKeyValueRepo.kt} | 18 ++++-- .../AbstractExposedOneToManyKeyValueRepo.kt | 35 ----------- .../onetomany/ExposedOneToManyKeyValueRepo.kt | 58 +++++++++++++++++++ ...kt => ExposedReadOneToManyKeyValueRepo.kt} | 20 ++++--- 10 files changed, 115 insertions(+), 57 deletions(-) create mode 100644 repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnAllocator.kt create mode 100644 repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedRepo.kt rename repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/{AbstractExposedKeyValueRepo.kt => ExposedKeyValueRepo.kt} (70%) rename repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/{AbstractExposedReadKeyValueRepo.kt => ExposedReadKeyValueRepo.kt} (66%) delete mode 100644 repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedOneToManyKeyValueRepo.kt create mode 100644 repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt rename repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/{AbstractExposedReadOneToManyKeyValueRepo.kt => ExposedReadOneToManyKeyValueRepo.kt} (67%) diff --git a/repos/exposed/build.gradle b/repos/exposed/build.gradle index a9382eaa414..dcb01813d04 100644 --- a/repos/exposed/build.gradle +++ b/repos/exposed/build.gradle @@ -9,6 +9,7 @@ kotlin { sourceSets { commonMain { dependencies { + api internalProject("micro_utils.coroutines") api internalProject("micro_utils.repos.common") api internalProject("micro_utils.pagination.exposed") } diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnAllocator.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnAllocator.kt new file mode 100644 index 00000000000..74bebd14606 --- /dev/null +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnAllocator.kt @@ -0,0 +1,6 @@ +package dev.inmo.micro_utils.repos.exposed + +import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.sql.Table + +typealias ColumnAllocator = Table.() -> Column \ No newline at end of file diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedCRUDRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedCRUDRepo.kt index 774264f44db..4ef53f226b0 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedCRUDRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedCRUDRepo.kt @@ -3,9 +3,7 @@ package dev.inmo.micro_utils.repos.exposed import dev.inmo.micro_utils.repos.Repo import org.jetbrains.exposed.sql.* -interface ExposedCRUDRepo : Repo { - val database: Database - +interface ExposedCRUDRepo : ExposedRepo { val ResultRow.asObject: ObjectType val selectById: SqlExpressionBuilder.(IdType) -> Op } diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedRepo.kt new file mode 100644 index 00000000000..a31d5d0f82e --- /dev/null +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedRepo.kt @@ -0,0 +1,10 @@ +package dev.inmo.micro_utils.repos.exposed + +import dev.inmo.micro_utils.repos.Repo +import org.jetbrains.exposed.sql.Database + +interface ExposedRepo : Repo { + val database: Database + + fun onInit() +} \ No newline at end of file diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt index 6f23d0dbb80..8b0587c96b2 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt @@ -6,3 +6,5 @@ import org.jetbrains.exposed.sql.transactions.transaction fun Table.initTable(database: Database) { transaction(database) { SchemaUtils.createMissingTablesAndColumns(this@initTable) } } + +fun T.initTable() where T: ExposedRepo, T: Table = initTable(database) diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedKeyValueRepo.kt similarity index 70% rename from repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt rename to repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedKeyValueRepo.kt index f4e53f0997d..f013ae86232 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedKeyValueRepo.kt @@ -1,6 +1,7 @@ package dev.inmo.micro_utils.repos.exposed.keyvalue import dev.inmo.micro_utils.repos.StandardKeyValueRepo +import dev.inmo.micro_utils.repos.exposed.* import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow @@ -8,14 +9,14 @@ import kotlinx.coroutines.flow.asFlow import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction -abstract class AbstractExposedKeyValueRepo( +open class ExposedKeyValueRepo( database: Database, - keyColumn: Column, - valueColumn: Column -) : StandardKeyValueRepo, AbstractExposedReadKeyValueRepo( + keyColumnAllocator: ColumnAllocator, + valueColumnAllocator: ColumnAllocator +) : StandardKeyValueRepo, ExposedRepo, ExposedReadKeyValueRepo( database, - keyColumn, - valueColumn + keyColumnAllocator, + valueColumnAllocator ) { private val onNewValueChannel = BroadcastChannel>(Channel.BUFFERED) private val onValueRemovedChannel = BroadcastChannel(Channel.BUFFERED) @@ -23,6 +24,8 @@ abstract class AbstractExposedKeyValueRepo( override val onNewValue: Flow> = onNewValueChannel.asFlow() override val onValueRemoved: Flow = onValueRemovedChannel.asFlow() + override fun onInit() { initTable() } + override suspend fun set(k: Key, v: Value) { transaction(database) { if (select { keyColumn.eq(k) }.limit(1).any()) { @@ -46,3 +49,6 @@ abstract class AbstractExposedKeyValueRepo( onValueRemovedChannel.send(k) } } + +@Deprecated("Renamed", ReplaceWith("ExposedKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo")) +typealias AbstractExposedKeyValueRepo = ExposedKeyValueRepo diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt similarity index 66% rename from repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt rename to repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt index 867f7439cd8..f91efecdc5e 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt @@ -2,16 +2,21 @@ package dev.inmo.micro_utils.repos.exposed.keyvalue import dev.inmo.micro_utils.pagination.* import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo +import dev.inmo.micro_utils.repos.exposed.* import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction -abstract class AbstractExposedReadKeyValueRepo( - protected val database: Database, - protected val keyColumn: Column, - protected val valueColumn: Column -) : ReadStandardKeyValueRepo, Table() { +open class ExposedReadKeyValueRepo( + override val database: Database, + keyColumnAllocator: ColumnAllocator, + valueColumnAllocator: ColumnAllocator, +) : ReadStandardKeyValueRepo, ExposedRepo, Table() { + protected val keyColumn: Column = keyColumnAllocator() + protected val valueColumn: Column = valueColumnAllocator() override val primaryKey: PrimaryKey = PrimaryKey(keyColumn, valueColumn) + override fun onInit() { initTable() } + override suspend fun get(k: Key): Value? = transaction(database) { select { keyColumn.eq(k) }.limit(1).firstOrNull() ?.getOrNull(valueColumn) } @@ -34,3 +39,6 @@ abstract class AbstractExposedReadKeyValueRepo( } }.createPaginationResult(pagination, count()) } + +@Deprecated("Renamed", ReplaceWith("ExposedReadKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedReadKeyValueRepo")) +typealias AbstractExposedReadKeyValueRepo = ExposedReadKeyValueRepo diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedOneToManyKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedOneToManyKeyValueRepo.kt deleted file mode 100644 index f0f5e45aa1e..00000000000 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedOneToManyKeyValueRepo.kt +++ /dev/null @@ -1,35 +0,0 @@ -package dev.inmo.micro_utils.repos.exposed.onetomany - -import dev.inmo.micro_utils.repos.OneToManyKeyValueRepo -import org.jetbrains.exposed.sql.* -import org.jetbrains.exposed.sql.transactions.transaction - -abstract class AbstractExposedOneToManyKeyValueRepo( - keyColumnAllocator: ColumnAllocator, - valueColumnAllocator: ColumnAllocator, - database: Database -) : OneToManyKeyValueRepo, AbstractExposedReadOneToManyKeyValueRepo( - keyColumnAllocator, - valueColumnAllocator, - database -) { - override suspend fun add(k: Key, v: Value) { - transaction(database) { - insert { - it[keyColumn] = k - it[valueColumn] = v - } - } - } - - override suspend fun remove(k: Key, v: Value) { - transaction(database) { deleteWhere { keyColumn.eq(k).and(valueColumn.eq(v)) } } - } - - override suspend fun clear(k: Key) { - transaction(database) { deleteWhere { keyColumn.eq(k) } } - } -} - -@Deprecated("Renamed", ReplaceWith("AbstractExposedOneToManyKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.onetomany.AbstractExposedOneToManyKeyValueRepo")) -typealias AbstractOneToManyExposedKeyValueRepo = AbstractExposedOneToManyKeyValueRepo diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt new file mode 100644 index 00000000000..d8202db1ad2 --- /dev/null +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt @@ -0,0 +1,58 @@ +package dev.inmo.micro_utils.repos.exposed.onetomany + +import dev.inmo.micro_utils.coroutines.BroadcastFlow +import dev.inmo.micro_utils.repos.OneToManyKeyValueRepo +import dev.inmo.micro_utils.repos.exposed.ColumnAllocator +import dev.inmo.micro_utils.repos.exposed.initTable +import kotlinx.coroutines.flow.Flow +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.transaction + +open class ExposedOneToManyKeyValueRepo( + database: Database, + keyColumnAllocator: ColumnAllocator, + valueColumnAllocator: ColumnAllocator +) : OneToManyKeyValueRepo, ExposedReadOneToManyKeyValueRepo( + database, + keyColumnAllocator, + valueColumnAllocator +) { + protected val _onNewValue: BroadcastFlow> = BroadcastFlow() + override val onNewValue: Flow> + get() = _onNewValue + protected val _onValueRemoved: BroadcastFlow> = BroadcastFlow() + override val onValueRemoved: Flow> + get() = _onValueRemoved + protected val _onDataCleared: BroadcastFlow = BroadcastFlow() + override val onDataCleared: Flow + get() = _onDataCleared + + override fun onInit() { initTable() } + + override suspend fun add(k: Key, v: Value) { + transaction(database) { + insert { + it[keyColumn] = k + it[valueColumn] = v + } + }.also { _onNewValue.send(k to v) } + } + + override suspend fun remove(k: Key, v: Value) { + transaction(database) { + deleteWhere { keyColumn.eq(k).and(valueColumn.eq(v)) } + }.also { _onValueRemoved.send(k to v) } + } + + override suspend fun clear(k: Key) { + transaction(database) { + deleteWhere { keyColumn.eq(k) } + }.also { _onDataCleared.send(k) } + } +} + +@Deprecated("Renamed", ReplaceWith("ExposedOneToManyKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo")) +typealias AbstractOneToManyExposedKeyValueRepo = ExposedOneToManyKeyValueRepo + +@Deprecated("Renamed", ReplaceWith("ExposedOneToManyKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo")) +typealias AbstractExposedOneToManyKeyValueRepo = ExposedOneToManyKeyValueRepo diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedReadOneToManyKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt similarity index 67% rename from repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedReadOneToManyKeyValueRepo.kt rename to repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt index 445ad25a04f..b1039a8363c 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedReadOneToManyKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt @@ -2,19 +2,20 @@ package dev.inmo.micro_utils.repos.exposed.onetomany import dev.inmo.micro_utils.pagination.* import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo +import dev.inmo.micro_utils.repos.exposed.* import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction -typealias ColumnAllocator = Table.() -> Column - -abstract class AbstractExposedReadOneToManyKeyValueRepo( +open class ExposedReadOneToManyKeyValueRepo( + override val database: Database, keyColumnAllocator: ColumnAllocator, - valueColumnAllocator: ColumnAllocator, - protected val database: Database -) : ReadOneToManyKeyValueRepo, Table() { + valueColumnAllocator: ColumnAllocator +) : ReadOneToManyKeyValueRepo, ExposedRepo, Table() { protected val keyColumn: Column = keyColumnAllocator() protected val valueColumn: Column = valueColumnAllocator() + override fun onInit() { initTable() } + override suspend fun count(k: Key): Long = transaction(database) { select { keyColumn.eq(k) }.count() } override suspend fun count(): Long = transaction(database) { selectAll().count() } @@ -46,5 +47,8 @@ abstract class AbstractExposedReadOneToManyKeyValueRepo( } } -@Deprecated("Renamed", ReplaceWith("AbstractExposedReadOneToManyKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.onetomany.AbstractExposedReadOneToManyKeyValueRepo")) -typealias AbstractOneToManyExposedReadKeyValueRepo = AbstractExposedReadOneToManyKeyValueRepo +@Deprecated("Renamed", ReplaceWith("ExposedReadOneToManyKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.onetomany.ExposedReadOneToManyKeyValueRepo")) +typealias AbstractOneToManyExposedReadKeyValueRepo = ExposedReadOneToManyKeyValueRepo + +@Deprecated("Renamed", ReplaceWith("ExposedReadOneToManyKeyValueRepo", "dev.inmo.micro_utils.repos.exposed.onetomany.ExposedReadOneToManyKeyValueRepo")) +typealias AbstractExposedReadOneToManyKeyValueRepo = ExposedReadOneToManyKeyValueRepo