mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2024-06-14 22:05:14 +00:00
fixes
This commit is contained in:
parent
9cbca864e3
commit
d56eb6c867
|
|
@ -137,9 +137,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
|
|||
override suspend fun deleteById(ids: List<IdType>) {
|
||||
onBeforeDelete(ids)
|
||||
transaction(db = database) {
|
||||
val deleted = deleteWhere(null, null) {
|
||||
selectByIds(ids)
|
||||
}
|
||||
val deleted = deleteWhere(null, null) { selectByIds(it, ids) }
|
||||
if (deleted == ids.size) {
|
||||
ids
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import org.jetbrains.exposed.sql.*
|
|||
|
||||
interface CommonExposedRepo<IdType, ObjectType> : ExposedRepo {
|
||||
val ResultRow.asObject: ObjectType
|
||||
val selectById: SqlExpressionBuilder.(IdType) -> Op<Boolean>
|
||||
val selectByIds: SqlExpressionBuilder.(List<IdType>) -> Op<Boolean>
|
||||
val selectById: ISqlExpressionBuilder.(IdType) -> Op<Boolean>
|
||||
val selectByIds: ISqlExpressionBuilder.(List<IdType>) -> Op<Boolean>
|
||||
get() = { list ->
|
||||
if (list.isEmpty()) {
|
||||
Op.FALSE
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ abstract class AbstractExposedKeyValueRepo<Key, Value>(
|
|||
|
||||
override suspend fun unset(toUnset: List<Key>) {
|
||||
transaction(database) {
|
||||
toUnset.mapNotNull {
|
||||
if (deleteWhere { selectById(it) } > 0) {
|
||||
it
|
||||
toUnset.mapNotNull { item ->
|
||||
if (deleteWhere { selectById(it, item) } > 0) {
|
||||
item
|
||||
} else {
|
||||
null
|
||||
}
|
||||
|
|
@ -75,7 +75,7 @@ abstract class AbstractExposedKeyValueRepo<Key, Value>(
|
|||
transaction(database) {
|
||||
toUnset.flatMap {
|
||||
val keys = select { selectByValue(it) }.mapNotNull { it.asKey }
|
||||
deleteWhere { selectByIds(keys) }
|
||||
deleteWhere { selectByIds(it, keys) }
|
||||
keys
|
||||
}
|
||||
}.distinct().forEach {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ abstract class AbstractExposedReadKeyValueRepo<Key, Value>(
|
|||
Table(tableName ?: "") {
|
||||
abstract val keyColumn: Column<*>
|
||||
abstract val ResultRow.asKey: Key
|
||||
abstract val selectByValue: SqlExpressionBuilder.(Value) -> Op<Boolean>
|
||||
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean>
|
||||
|
||||
override suspend fun get(k: Key): Value? = transaction(database) {
|
||||
select { selectById(k) }.limit(1).firstOrNull() ?.asObject
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import dev.inmo.micro_utils.repos.KeyValueRepo
|
|||
import dev.inmo.micro_utils.repos.exposed.ColumnAllocator
|
||||
import kotlinx.coroutines.flow.*
|
||||
import org.jetbrains.exposed.sql.*
|
||||
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
|
||||
open class ExposedKeyValueRepo<Key, Value>(
|
||||
|
|
@ -47,9 +49,9 @@ open class ExposedKeyValueRepo<Key, Value>(
|
|||
|
||||
override suspend fun unset(toUnset: List<Key>) {
|
||||
transaction(database) {
|
||||
toUnset.mapNotNull {
|
||||
if (deleteWhere { keyColumn.eq(it) } > 0) {
|
||||
it
|
||||
toUnset.mapNotNull { item ->
|
||||
if (deleteWhere { keyColumn.eq(item) } > 0) {
|
||||
item
|
||||
} else {
|
||||
null
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@ open class ExposedReadKeyValueRepo<Key, Value>(
|
|||
val valueColumn: Column<Value> = valueColumnAllocator()
|
||||
override val ResultRow.asKey: Key
|
||||
get() = get(keyColumn)
|
||||
override val selectByValue: SqlExpressionBuilder.(Value) -> Op<Boolean> = { valueColumn.eq(it) }
|
||||
override val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean> = { valueColumn.eq(it) }
|
||||
override val ResultRow.asObject: Value
|
||||
get() = get(valueColumn)
|
||||
override val selectById: SqlExpressionBuilder.(Key) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
override val selectById: ISqlExpressionBuilder.(Key) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
override val primaryKey: Table.PrimaryKey
|
||||
get() = PrimaryKey(keyColumn, valueColumn)
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ abstract class AbstractExposedKeyValuesRepo<Key, Value>(
|
|||
transaction(database) {
|
||||
toRemove.keys.flatMap { k ->
|
||||
toRemove[k] ?.mapNotNull { v ->
|
||||
if (deleteWhere { selectById(k).and(selectByValue(v)) } > 0 ) {
|
||||
if (deleteWhere { selectById(it, k).and(SqlExpressionBuilder.selectByValue(v)) } > 0 ) {
|
||||
k to v
|
||||
} else {
|
||||
null
|
||||
|
|
@ -63,7 +63,7 @@ abstract class AbstractExposedKeyValuesRepo<Key, Value>(
|
|||
|
||||
override suspend fun clear(k: Key) {
|
||||
transaction(database) {
|
||||
deleteWhere { selectById(k) }
|
||||
deleteWhere { selectById(it, k) }
|
||||
}.also { _onDataCleared.emit(k) }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
|
|||
Table(tableName ?: "") {
|
||||
abstract val keyColumn: Column<*>
|
||||
abstract val ResultRow.asKey: Key
|
||||
abstract val selectByValue: SqlExpressionBuilder.(Value) -> Op<Boolean>
|
||||
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean>
|
||||
|
||||
override suspend fun count(k: Key): Long = transaction(database) { select { selectById(k) }.count() }
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import dev.inmo.micro_utils.repos.KeyValuesRepo
|
|||
import dev.inmo.micro_utils.repos.exposed.ColumnAllocator
|
||||
import kotlinx.coroutines.flow.*
|
||||
import org.jetbrains.exposed.sql.*
|
||||
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
|
||||
typealias ExposedOneToManyKeyValueRepo1<Key, Value> = ExposedKeyValuesRepo<Key, Value>
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ open class ExposedReadKeyValuesRepo<Key, Value>(
|
|||
override val keyColumn: Column<Key> = keyColumnAllocator()
|
||||
override val ResultRow.asKey: Key
|
||||
get() = get(keyColumn)
|
||||
override val selectByValue: SqlExpressionBuilder.(Value) -> Op<Boolean> = { valueColumn.eq(it) }
|
||||
override val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean> = { valueColumn.eq(it) }
|
||||
override val ResultRow.asObject: Value
|
||||
get() = get(valueColumn)
|
||||
override val selectById: SqlExpressionBuilder.(Key) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
override val selectById: ISqlExpressionBuilder.(Key) -> Op<Boolean> = { keyColumn.eq(it) }
|
||||
val valueColumn: Column<Value> = valueColumnAllocator()
|
||||
|
||||
init { initTable() }
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user