InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2026-01-28 16:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #638 from InsanusMokrassar/0.28.0

Browse Source 
0.28.0
This commit is contained in:
InsanusMokrassar
2026-01-27 23:37:56 +06:00
committed by GitHub
parent 82460d2ce3 23d58d42ee
commit c72a6fda5d
32 changed files with 176 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,5 +1,7 @@
# Changelog # Changelog
## 0.28.0
## 0.27.0 ## 0.27.0
* `Versions`: * `Versions`:

5
build.gradle
View File

@@ -44,6 +44,11 @@ allprojects {
maven { url "https://nexus.inmo.dev/repository/maven-releases/" } maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
mavenLocal() mavenLocal()
} }
it.tasks.withType(AbstractTestTask).configureEach {
it.failOnNoDiscoveredTests = false
}
} }
apply from: "./extensions.gradle" apply from: "./extensions.gradle"

8
dokka/build.gradle
View File

@@ -26,7 +26,7 @@ kotlin {
project.parent.subprojects.forEach { project.parent.subprojects.forEach {
if ( if (
it != project it.name != project.name
&& it.hasProperty("kotlin") && it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
&& it.kotlin.sourceSets.any { it.name.contains("jsMain") } && it.kotlin.sourceSets.any { it.name.contains("jsMain") }
@@ -44,7 +44,7 @@ kotlin {
project.parent.subprojects.forEach { project.parent.subprojects.forEach {
if ( if (
it != project it.name != project.name
&& it.hasProperty("kotlin") && it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
&& it.kotlin.sourceSets.any { it.name.contains("jsMain") } && it.kotlin.sourceSets.any { it.name.contains("jsMain") }
@@ -60,7 +60,7 @@ kotlin {
project.parent.subprojects.forEach { project.parent.subprojects.forEach {
if ( if (
it != project it.name != project.name
&& it.hasProperty("kotlin") && it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
&& it.kotlin.sourceSets.any { it.name.contains("jvmMain") } && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
@@ -76,7 +76,7 @@ kotlin {
project.parent.subprojects.forEach { project.parent.subprojects.forEach {
if ( if (
it != project it.name != project.name
&& it.hasProperty("kotlin") && it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") } && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
&& it.kotlin.sourceSets.any { it.name.contains("androidMain") } && it.kotlin.sourceSets.any { it.name.contains("androidMain") }

10
github_release.gradle
View File

@@ -1,9 +1,15 @@
interface InjectedExecOps {
@Inject //@javax.inject.Inject
ExecOperations getExecOps()
}
private String getCurrentVersionChangelog() { private String getCurrentVersionChangelog() {
OutputStream changelogDataOS = new ByteArrayOutputStream() OutputStream changelogDataOS = new ByteArrayOutputStream()
exec {
def injected = project.objects.newInstance(InjectedExecOps)
injected.execOps.exec {
commandLine 'chmod', "+x", './changelog_parser.sh' commandLine 'chmod', "+x", './changelog_parser.sh'
} }
exec { injected.execOps.exec {
standardOutput = changelogDataOS standardOutput = changelogDataOS
commandLine './changelog_parser.sh', "${project.version}", 'CHANGELOG.md' commandLine './changelog_parser.sh', "${project.version}", 'CHANGELOG.md'
} }

4
gradle.properties
View File

@@ -18,5 +18,5 @@ crypto_js_version=4.1.1
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.27.0 version=0.28.0
android_code_version=308 android_code_version=309

10
gradle/libs.versions.toml
View File

@@ -1,7 +1,7 @@
[versions] [versions]
kt = "2.2.21" kt = "2.3.0"
kt-serialization = "1.9.0" kt-serialization = "1.10.0"
kt-coroutines = "1.10.2" kt-coroutines = "1.10.2"
kotlinx-browser = "0.5.0" kotlinx-browser = "0.5.0"
@@ -11,7 +11,7 @@ kslog = "1.5.2"
jb-compose = "1.10.0" jb-compose = "1.10.0"
jb-compose-material3 = "1.10.0-alpha05" jb-compose-material3 = "1.10.0-alpha05"
jb-compose-icons = "1.7.8" jb-compose-icons = "1.7.8"
jb-exposed = "0.61.0" jb-exposed = "1.0.0"
jb-dokka = "2.1.0" jb-dokka = "2.1.0"
# 3.51.0.0 contains bug, checking with ./gradlew :micro_utils.repos.exposed:jvmTest # 3.51.0.0 contains bug, checking with ./gradlew :micro_utils.repos.exposed:jvmTest
@@ -20,7 +20,7 @@ sqlite = "3.50.1.0"
korlibs = "5.4.0" korlibs = "5.4.0"
uuid = "0.8.4" uuid = "0.8.4"
ktor = "3.3.3" ktor = "3.4.0"
gh-release = "2.5.2" gh-release = "2.5.2"
@@ -32,7 +32,7 @@ ksp = "2.3.4"
kotlin-poet = "2.2.0" kotlin-poet = "2.2.0"
versions = "0.53.0" versions = "0.53.0"
nmcp = "1.2.0" nmcp = "1.2.1"
android-gradle = "8.12.+" android-gradle = "8.12.+"
dexcount = "4.0.0" dexcount = "4.0.0"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
language_codes/generator/build.gradle
View File

@@ -23,7 +23,9 @@ dependencies {
implementation libs.ktor.client.java implementation libs.ktor.client.java
} }
mainClassName="MainKt" application {
mainClass = "MainKt"
}
java { java {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17

2
pagination/exposed/build.gradle
View File

@@ -14,7 +14,7 @@ kotlin {
} }
jvmMain { jvmMain {
dependencies { dependencies {
api libs.jb.exposed api libs.jb.exposed.jdbc
} }
} }
} }

4
pagination/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/QueryExtensions.kt
View File

@@ -1,6 +1,8 @@
package dev.inmo.micro_utils.pagination package dev.inmo.micro_utils.pagination
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Expression
import org.jetbrains.exposed.v1.core.SortOrder
import org.jetbrains.exposed.v1.jdbc.Query
fun Query.paginate(with: Pagination, orderBy: Pair<Expression<*>, SortOrder>? = null) = fun Query.paginate(with: Pagination, orderBy: Pair<Expression<*>, SortOrder>? = null) =
limit(with.size) limit(with.size)

4
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/AbstractExposedReadCRUDRepo.kt
View File

@@ -2,8 +2,8 @@ package dev.inmo.micro_utils.repos.exposed
import dev.inmo.micro_utils.pagination.* import dev.inmo.micro_utils.pagination.*
import dev.inmo.micro_utils.repos.ReadCRUDRepo import dev.inmo.micro_utils.repos.ReadCRUDRepo
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.transactions.transaction
abstract class AbstractExposedReadCRUDRepo<ObjectType, IdType>( abstract class AbstractExposedReadCRUDRepo<ObjectType, IdType>(
tableName: String tableName: String

15
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/AbstractExposedWriteCRUDRepo.kt
View File

@@ -4,9 +4,12 @@ import dev.inmo.micro_utils.repos.UpdatedValuePair
import dev.inmo.micro_utils.repos.WriteCRUDRepo import dev.inmo.micro_utils.repos.WriteCRUDRepo
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.statements.InsertStatement
import org.jetbrains.exposed.sql.statements.* import org.jetbrains.exposed.v1.core.statements.UpdateBuilder
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.deleteWhere
import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
import org.jetbrains.exposed.v1.jdbc.update
import java.util.Objects import java.util.Objects
abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>( abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
@@ -93,7 +96,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
return transaction(db = database) { return transaction(db = database) {
update( update(
{ {
selectById(this, id) selectById( id)
} }
) { ) {
update(id, value, it as UpdateBuilder<Int>) update(id, value, it as UpdateBuilder<Int>)
@@ -102,7 +105,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
if (it > 0) { if (it > 0) {
transaction(db = database) { transaction(db = database) {
selectAll().where { selectAll().where {
selectById(this, id) selectById(id)
}.limit(1).firstOrNull() ?.asObject }.limit(1).firstOrNull() ?.asObject
} }
} else { } else {
@@ -137,7 +140,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
override suspend fun deleteById(ids: List<IdType>) { override suspend fun deleteById(ids: List<IdType>) {
onBeforeDelete(ids) onBeforeDelete(ids)
transaction(db = database) { transaction(db = database) {
val deleted = deleteWhere { selectByIds(it, ids) } val deleted = deleteWhere { selectByIds(ids) }
if (deleted == ids.size) { if (deleted == ids.size) {
ids ids
} else { } else {

4
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnAllocator.kt
View File

@@ -1,6 +1,6 @@
package dev.inmo.micro_utils.repos.exposed package dev.inmo.micro_utils.repos.exposed
import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.sql.Table import org.jetbrains.exposed.v1.core.Table
typealias ColumnAllocator<T> = Table.() -> Column<T> typealias ColumnAllocator<T> = Table.() -> Column<T>

10
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnEqOrNull.kt
View File

@@ -1,10 +1,10 @@
package dev.inmo.micro_utils.repos.exposed package dev.inmo.micro_utils.repos.exposed
import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNotNull import org.jetbrains.exposed.v1.core.isNotNull
import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull import org.jetbrains.exposed.v1.core.isNull
import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq import org.jetbrains.exposed.v1.core.neq
fun <T> Column<T?>.eqOrIsNull( fun <T> Column<T?>.eqOrIsNull(
value: T? value: T?

8
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/CommonExposedRepo.kt
View File

@@ -1,12 +1,14 @@
package dev.inmo.micro_utils.repos.exposed package dev.inmo.micro_utils.repos.exposed
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.v1.core.or
interface CommonExposedRepo<IdType, ObjectType> : ExposedRepo { interface CommonExposedRepo<IdType, ObjectType> : ExposedRepo {
val ResultRow.asObject: ObjectType val ResultRow.asObject: ObjectType
val ResultRow.asId: IdType val ResultRow.asId: IdType
val selectById: ISqlExpressionBuilder.(IdType) -> Op<Boolean> val selectById: (IdType) -> Op<Boolean>
val selectByIds: ISqlExpressionBuilder.(List<IdType>) -> Op<Boolean> val selectByIds: (List<IdType>) -> Op<Boolean>
get() = { get() = {
if (it.isEmpty()) { if (it.isEmpty()) {
Op.FALSE Op.FALSE

2
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedCRUDRepo.kt
View File

@@ -1,5 +1,3 @@
package dev.inmo.micro_utils.repos.exposed package dev.inmo.micro_utils.repos.exposed
import org.jetbrains.exposed.sql.*
interface ExposedCRUDRepo<ObjectType, IdType> : CommonExposedRepo<IdType, ObjectType> interface ExposedCRUDRepo<ObjectType, IdType> : CommonExposedRepo<IdType, ObjectType>

6
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedRepo.kt
View File

@@ -1,7 +1,11 @@
package dev.inmo.micro_utils.repos.exposed package dev.inmo.micro_utils.repos.exposed
import dev.inmo.micro_utils.repos.Repo import dev.inmo.micro_utils.repos.Repo
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.FieldSet
import org.jetbrains.exposed.v1.core.Transaction
import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.Query
import org.jetbrains.exposed.v1.jdbc.selectAll
interface ExposedRepo : Repo, FieldSet { interface ExposedRepo : Repo, FieldSet {
val database: Database val database: Database

22
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt
View File

@@ -1,11 +1,15 @@
package dev.inmo.micro_utils.repos.exposed package dev.inmo.micro_utils.repos.exposed
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.sql.SchemaUtils.addMissingColumnsStatements import org.jetbrains.exposed.v1.core.Transaction
import org.jetbrains.exposed.sql.SchemaUtils.checkMappingConsistence import org.jetbrains.exposed.v1.core.exposedLogger
import org.jetbrains.exposed.sql.SchemaUtils.createStatements import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.sql.transactions.TransactionManager import org.jetbrains.exposed.v1.jdbc.SchemaUtils
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.SchemaUtils.addMissingColumnsStatements
import org.jetbrains.exposed.v1.jdbc.SchemaUtils.checkMappingConsistence
import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
/** /**
* Code in this function mostly duplicates Exposed [SchemaUtils.createMissingTablesAndColumns]. It made due to deprecation * Code in this function mostly duplicates Exposed [SchemaUtils.createMissingTablesAndColumns]. It made due to deprecation
@@ -41,9 +45,9 @@ fun initTablesInTransaction(vararg tables: Table, database: Database, inBatch: B
} }
} }
with(TransactionManager.current()) { with(TransactionManager.current()) {
db.dialect.resetCaches() db.dialectMetadata.resetCaches()
val createStatements = logTimeSpent("Preparing create tables statements", withLogs) { val createStatements = logTimeSpent("Preparing create tables statements", withLogs) {
createStatements(*tables) SchemaUtils.createStatements(*tables)
} }
logTimeSpent("Executing create tables statements", withLogs) { logTimeSpent("Executing create tables statements", withLogs) {
execStatements(inBatch, createStatements) execStatements(inBatch, createStatements)
@@ -66,7 +70,7 @@ fun initTablesInTransaction(vararg tables: Table, database: Database, inBatch: B
execStatements(inBatch, modifyTablesStatements) execStatements(inBatch, modifyTablesStatements)
commit() commit()
} }
db.dialect.resetCaches() db.dialectMetadata.resetCaches()
} }
} }
} }

15
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt
View File

@@ -3,9 +3,14 @@ package dev.inmo.micro_utils.repos.exposed.keyvalue
import dev.inmo.micro_utils.repos.KeyValueRepo import dev.inmo.micro_utils.repos.KeyValueRepo
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import org.jetbrains.exposed.sql.* import kotlinx.coroutines.flow.update
import org.jetbrains.exposed.sql.statements.* import org.jetbrains.exposed.v1.core.statements.UpdateBuilder
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.deleteAll
import org.jetbrains.exposed.v1.jdbc.deleteWhere
import org.jetbrains.exposed.v1.jdbc.update
import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
abstract class AbstractExposedKeyValueRepo<Key, Value>( abstract class AbstractExposedKeyValueRepo<Key, Value>(
override val database: Database, override val database: Database,
@@ -54,7 +59,7 @@ abstract class AbstractExposedKeyValueRepo<Key, Value>(
override suspend fun unset(toUnset: List<Key>) { override suspend fun unset(toUnset: List<Key>) {
transaction(database) { transaction(database) {
toUnset.mapNotNull { item -> toUnset.mapNotNull { item ->
if (deleteWhere { selectById(it, item) } > 0) { if (deleteWhere { selectById(item) } > 0) {
item item
} else { } else {
null null
@@ -69,7 +74,7 @@ abstract class AbstractExposedKeyValueRepo<Key, Value>(
transaction(database) { transaction(database) {
toUnset.flatMap { toUnset.flatMap {
val keys = selectAll().where { selectByValue(it) }.mapNotNull { it.asKey } val keys = selectAll().where { selectByValue(it) }.mapNotNull { it.asKey }
deleteWhere { selectByIds(it, keys) } deleteWhere { selectByIds(keys) }
keys keys
} }
}.distinct().forEach { }.distinct().forEach {

10
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt
View File

@@ -4,8 +4,12 @@ import dev.inmo.micro_utils.pagination.*
import dev.inmo.micro_utils.repos.ReadKeyValueRepo import dev.inmo.micro_utils.repos.ReadKeyValueRepo
import dev.inmo.micro_utils.repos.exposed.* import dev.inmo.micro_utils.repos.exposed.*
import dev.inmo.micro_utils.repos.exposed.utils.selectPaginated import dev.inmo.micro_utils.repos.exposed.utils.selectPaginated
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
abstract class AbstractExposedReadKeyValueRepo<Key, Value>( abstract class AbstractExposedReadKeyValueRepo<Key, Value>(
override val database: Database, override val database: Database,
@@ -21,7 +25,7 @@ abstract class AbstractExposedReadKeyValueRepo<Key, Value>(
abstract val ResultRow.asKey: Key abstract val ResultRow.asKey: Key
override val ResultRow.asId: Key override val ResultRow.asId: Key
get() = asKey get() = asKey
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean> abstract val selectByValue: (Value) -> Op<Boolean>
override suspend fun get(k: Key): Value? = transaction(database) { override suspend fun get(k: Key): Value? = transaction(database) {
selectAll().where { selectById(k) }.limit(1).firstOrNull() ?.asObject selectAll().where { selectById(k) }.limit(1).firstOrNull() ?.asObject

13
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedKeyValueRepo.kt
View File

@@ -4,11 +4,14 @@ import dev.inmo.micro_utils.repos.KeyValueRepo
import dev.inmo.micro_utils.repos.exposed.ColumnAllocator import dev.inmo.micro_utils.repos.exposed.ColumnAllocator
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.v1.core.inList
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inSubQuery import org.jetbrains.exposed.v1.jdbc.deleteAll
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.deleteWhere
import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
import org.jetbrains.exposed.v1.jdbc.update
open class ExposedKeyValueRepo<Key, Value>( open class ExposedKeyValueRepo<Key, Value>(
database: Database, database: Database,

16
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt
View File

@@ -1,13 +1,13 @@
package dev.inmo.micro_utils.repos.exposed.keyvalue package dev.inmo.micro_utils.repos.exposed.keyvalue
import dev.inmo.micro_utils.pagination.*
import dev.inmo.micro_utils.repos.ReadKeyValueRepo import dev.inmo.micro_utils.repos.ReadKeyValueRepo
import dev.inmo.micro_utils.repos.exposed.* import dev.inmo.micro_utils.repos.exposed.*
import dev.inmo.micro_utils.repos.exposed.utils.selectPaginated import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.sql.statements.InsertStatement import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.sql.statements.UpdateBuilder import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.v1.jdbc.Database
open class ExposedReadKeyValueRepo<Key, Value>( open class ExposedReadKeyValueRepo<Key, Value>(
database: Database, database: Database,
@@ -20,10 +20,10 @@ open class ExposedReadKeyValueRepo<Key, Value>(
val valueColumn: Column<Value> = valueColumnAllocator() val valueColumn: Column<Value> = valueColumnAllocator()
override val ResultRow.asKey: Key override val ResultRow.asKey: Key
get() = get(keyColumn) get() = get(keyColumn)
override val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean> = { valueColumn.eq(it) } override val selectByValue: (Value) -> Op<Boolean> = { valueColumn.eq(it) }
override val ResultRow.asObject: Value override val ResultRow.asObject: Value
get() = get(valueColumn) get() = get(valueColumn)
override val selectById: ISqlExpressionBuilder.(Key) -> Op<Boolean> = { keyColumn.eq(it) } override val selectById: (Key) -> Op<Boolean> = { keyColumn.eq(it) }
override val primaryKey: Table.PrimaryKey override val primaryKey: Table.PrimaryKey
get() = PrimaryKey(keyColumn, valueColumn) get() = PrimaryKey(keyColumn, valueColumn)

16
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedKeyValuesRepo.kt
View File

@@ -3,9 +3,13 @@ package dev.inmo.micro_utils.repos.exposed.onetomany
import dev.inmo.micro_utils.repos.KeyValuesRepo import dev.inmo.micro_utils.repos.KeyValuesRepo
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.and
import org.jetbrains.exposed.sql.statements.UpdateBuilder import org.jetbrains.exposed.v1.core.statements.UpdateBuilder
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.batchInsert
import org.jetbrains.exposed.v1.jdbc.deleteWhere
import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
abstract class AbstractExposedKeyValuesRepo<Key, Value>( abstract class AbstractExposedKeyValuesRepo<Key, Value>(
override val database: Database, override val database: Database,
@@ -60,7 +64,7 @@ abstract class AbstractExposedKeyValuesRepo<Key, Value>(
val oldObjects = selectAll().where { selectByIds(toSet.keys.toList()) }.map { it.asKey to it.asObject } val oldObjects = selectAll().where { selectByIds(toSet.keys.toList()) }.map { it.asKey to it.asObject }
deleteWhere { deleteWhere {
selectByIds(it, toSet.keys.toList()) selectByIds(toSet.keys.toList())
} }
val inserted = batchInsert( val inserted = batchInsert(
prepreparedData, prepreparedData,
@@ -104,7 +108,7 @@ abstract class AbstractExposedKeyValuesRepo<Key, Value>(
transaction(database) { transaction(database) {
toRemove.keys.flatMap { k -> toRemove.keys.flatMap { k ->
toRemove[k] ?.mapNotNull { v -> toRemove[k] ?.mapNotNull { v ->
if (deleteWhere { selectById(it, k).and(SqlExpressionBuilder.selectByValue(v)) } > 0 ) { if (deleteWhere { selectById(k).and(selectByValue(v)) } > 0 ) {
k to v k to v
} else { } else {
null null
@@ -118,7 +122,7 @@ abstract class AbstractExposedKeyValuesRepo<Key, Value>(
override suspend fun clear(k: Key) { override suspend fun clear(k: Key) {
transaction(database) { transaction(database) {
deleteWhere { selectById(it, k) } deleteWhere { selectById(k) }
}.also { _onDataCleared.emit(k) } }.also { _onDataCleared.emit(k) }
} }
} }

12
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedReadKeyValuesRepo.kt
View File

@@ -4,8 +4,14 @@ import dev.inmo.micro_utils.pagination.*
import dev.inmo.micro_utils.repos.ReadKeyValuesRepo import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
import dev.inmo.micro_utils.repos.exposed.* import dev.inmo.micro_utils.repos.exposed.*
import dev.inmo.micro_utils.repos.exposed.utils.selectPaginated import dev.inmo.micro_utils.repos.exposed.utils.selectPaginated
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.v1.core.SortOrder
import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.v1.core.and
import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
abstract class AbstractExposedReadKeyValuesRepo<Key, Value>( abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
override val database: Database, override val database: Database,
@@ -17,7 +23,7 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
abstract val ResultRow.asKey: Key abstract val ResultRow.asKey: Key
override val ResultRow.asId: Key override val ResultRow.asId: Key
get() = asKey get() = asKey
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean> abstract val selectByValue: (Value) -> Op<Boolean>
override suspend fun count(k: Key): Long = transaction(database) { selectAll().where { selectById(k) }.count() } override suspend fun count(k: Key): Long = transaction(database) { selectAll().where { selectById(k) }.count() }

15
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedKeyValuesRepo.kt
View File

@@ -4,10 +4,13 @@ import dev.inmo.micro_utils.repos.KeyValuesRepo
import dev.inmo.micro_utils.repos.exposed.ColumnAllocator import dev.inmo.micro_utils.repos.exposed.ColumnAllocator
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.and
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList import org.jetbrains.exposed.v1.core.inList
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.deleteWhere
import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
typealias ExposedOneToManyKeyValueRepo1<Key, Value> = ExposedKeyValuesRepo<Key, Value> typealias ExposedOneToManyKeyValueRepo1<Key, Value> = ExposedKeyValuesRepo<Key, Value>
open class ExposedKeyValuesRepo<Key, Value>( open class ExposedKeyValuesRepo<Key, Value>(
@@ -34,7 +37,7 @@ open class ExposedKeyValuesRepo<Key, Value>(
get() = _onDataCleared get() = _onDataCleared
override suspend fun add(toAdd: Map<Key, List<Value>>) { override suspend fun add(toAdd: Map<Key, List<Value>>) {
transaction(database) { transaction (database) {
toAdd.keys.flatMap { k -> toAdd.keys.flatMap { k ->
toAdd[k] ?.mapNotNull { v -> toAdd[k] ?.mapNotNull { v ->
if (selectAll().where { keyColumn.eq(k).and(valueColumn.eq(v)) }.limit(1).count() > 0) { if (selectAll().where { keyColumn.eq(k).and(valueColumn.eq(v)) }.limit(1).count() > 0) {
@@ -73,7 +76,7 @@ open class ExposedKeyValuesRepo<Key, Value>(
override suspend fun removeWithValue(v: Value) { override suspend fun removeWithValue(v: Value) {
transaction(database) { transaction(database) {
val keys = selectAll().where { selectByValue(v) }.map { it.asKey } val keys = selectAll().where { selectByValue(v) }.map { it.asKey }
deleteWhere { SqlExpressionBuilder.selectByValue(v) } deleteWhere { selectByValue(v) }
keys keys
}.forEach { }.forEach {
_onValueRemoved.emit(it to v) _onValueRemoved.emit(it to v)

10
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadKeyValuesRepo.kt
View File

@@ -2,7 +2,11 @@ package dev.inmo.micro_utils.repos.exposed.onetomany
import dev.inmo.micro_utils.repos.ReadKeyValuesRepo import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
import dev.inmo.micro_utils.repos.exposed.* import dev.inmo.micro_utils.repos.exposed.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.v1.jdbc.Database
typealias ExposedReadOneToManyKeyValueRepo<Key, Value> = ExposedReadKeyValuesRepo<Key, Value> typealias ExposedReadOneToManyKeyValueRepo<Key, Value> = ExposedReadKeyValuesRepo<Key, Value>
@@ -15,10 +19,10 @@ open class ExposedReadKeyValuesRepo<Key, Value>(
override val keyColumn: Column<Key> = keyColumnAllocator() override val keyColumn: Column<Key> = keyColumnAllocator()
override val ResultRow.asKey: Key override val ResultRow.asKey: Key
get() = get(keyColumn) get() = get(keyColumn)
override val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean> = { valueColumn.eq(it) } override val selectByValue: (Value) -> Op<Boolean> = { valueColumn.eq(it) }
override val ResultRow.asObject: Value override val ResultRow.asObject: Value
get() = get(valueColumn) get() = get(valueColumn)
override val selectById: ISqlExpressionBuilder.(Key) -> Op<Boolean> = { keyColumn.eq(it) } override val selectById: (Key) -> Op<Boolean> = { keyColumn.eq(it) }
val valueColumn: Column<Value> = valueColumnAllocator() val valueColumn: Column<Value> = valueColumnAllocator()
init { initTable() } init { initTable() }

5
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/utils/PaginatedSelect.kt
View File

@@ -1,7 +1,10 @@
package dev.inmo.micro_utils.repos.exposed.utils package dev.inmo.micro_utils.repos.exposed.utils
import dev.inmo.micro_utils.pagination.* import dev.inmo.micro_utils.pagination.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Expression
import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.v1.core.SortOrder
import org.jetbrains.exposed.v1.jdbc.Query
fun <T> Query.selectPaginated( fun <T> Query.selectPaginated(
pagination: Pagination, pagination: Pagination,

8
repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt
View File

@@ -3,8 +3,12 @@ package dev.inmo.micro_utils.repos.exposed.versions
import dev.inmo.micro_utils.repos.exposed.ExposedRepo import dev.inmo.micro_utils.repos.exposed.ExposedRepo
import dev.inmo.micro_utils.repos.exposed.initTable import dev.inmo.micro_utils.repos.exposed.initTable
import dev.inmo.micro_utils.repos.versions.* import dev.inmo.micro_utils.repos.versions.*
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.v1.jdbc.insert
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
import org.jetbrains.exposed.v1.jdbc.update
/** /**
* Use this method to create [StandardVersionsRepo] based on [Database] with [ExposedStandardVersionsRepoProxy] as * Use this method to create [StandardVersionsRepo] based on [Database] with [ExposedStandardVersionsRepoProxy] as

4
repos/exposed/src/jvmTest/kotlin/Database.kt
View File

@@ -1,8 +1,8 @@
package full package full
import com.benasher44.uuid.uuid4 import com.benasher44.uuid.uuid4
import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.v1.jdbc.Database
import org.jetbrains.exposed.sql.transactions.transactionManager import org.jetbrains.exposed.v1.jdbc.transactions.transactionManager
import org.sqlite.JDBC import org.sqlite.JDBC
import java.io.File import java.io.File
import java.sql.Connection import java.sql.Connection

14
repos/exposed/src/jvmTest/kotlin/ExposedCRUDRepoTests.kt
View File

@@ -5,12 +5,12 @@ import dev.inmo.micro_utils.repos.CRUDRepo
import dev.inmo.micro_utils.repos.common.tests.CommonCRUDRepoTests import dev.inmo.micro_utils.repos.common.tests.CommonCRUDRepoTests
import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo
import dev.inmo.micro_utils.repos.exposed.initTable import dev.inmo.micro_utils.repos.exposed.initTable
import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.sql.ISqlExpressionBuilder import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.sql.Op import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.sql.ResultRow import org.jetbrains.exposed.v1.core.statements.InsertStatement
import org.jetbrains.exposed.sql.statements.InsertStatement import org.jetbrains.exposed.v1.core.statements.UpdateBuilder
import org.jetbrains.exposed.sql.statements.UpdateBuilder import org.jetbrains.exposed.v1.jdbc.Database
import java.io.File import java.io.File
import kotlin.test.AfterTest import kotlin.test.AfterTest
import kotlin.test.BeforeTest import kotlin.test.BeforeTest
@@ -29,7 +29,7 @@ class ExposedCRUDRepoTests : CommonCRUDRepoTests() {
asId, asId,
get(dataColumn) get(dataColumn)
) )
override val selectById: ISqlExpressionBuilder.(String) -> Op<Boolean> = { idColumn.eq(it) } override val selectById: (String) -> Op<Boolean> = { idColumn.eq(it) }
init { init {
initTable() initTable()

14
repos/exposed/src/jvmTest/kotlin/ExposedKeyValueRepoTests.kt
View File

@@ -4,11 +4,11 @@ import dev.inmo.micro_utils.repos.KeyValueRepo
import dev.inmo.micro_utils.repos.common.tests.CommonKeyValueRepoTests import dev.inmo.micro_utils.repos.common.tests.CommonKeyValueRepoTests
import dev.inmo.micro_utils.repos.exposed.initTable import dev.inmo.micro_utils.repos.exposed.initTable
import dev.inmo.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo import dev.inmo.micro_utils.repos.exposed.keyvalue.AbstractExposedKeyValueRepo
import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.sql.ISqlExpressionBuilder import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.sql.Op import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.sql.ResultRow import org.jetbrains.exposed.v1.core.statements.UpdateBuilder
import org.jetbrains.exposed.sql.statements.UpdateBuilder import org.jetbrains.exposed.v1.jdbc.Database
import java.io.File import java.io.File
import kotlin.test.AfterTest import kotlin.test.AfterTest
import kotlin.test.BeforeTest import kotlin.test.BeforeTest
@@ -22,10 +22,10 @@ class ExposedKeyValueRepoTests : CommonKeyValueRepoTests() {
override val ResultRow.asKey: String override val ResultRow.asKey: String
get() = get(keyColumn) get() = get(keyColumn)
override val selectByValue: ISqlExpressionBuilder.(String) -> Op<Boolean> = { dataColumn.eq(it) } override val selectByValue: (String) -> Op<Boolean> = { dataColumn.eq(it) }
override val ResultRow.asObject: String override val ResultRow.asObject: String
get() = get(dataColumn) get() = get(dataColumn)
override val selectById: ISqlExpressionBuilder.(String) -> Op<Boolean> = { keyColumn.eq(it) } override val selectById: (String) -> Op<Boolean> = { keyColumn.eq(it) }
init { init {
initTable() initTable()

14
repos/exposed/src/jvmTest/kotlin/ExposedKeyValuesRepoTests.kt
View File

@@ -4,11 +4,11 @@ import dev.inmo.micro_utils.repos.KeyValuesRepo
import dev.inmo.micro_utils.repos.common.tests.CommonKeyValuesRepoTests import dev.inmo.micro_utils.repos.common.tests.CommonKeyValuesRepoTests
import dev.inmo.micro_utils.repos.exposed.initTable import dev.inmo.micro_utils.repos.exposed.initTable
import dev.inmo.micro_utils.repos.exposed.onetomany.AbstractExposedKeyValuesRepo import dev.inmo.micro_utils.repos.exposed.onetomany.AbstractExposedKeyValuesRepo
import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.v1.core.Op
import org.jetbrains.exposed.sql.ISqlExpressionBuilder import org.jetbrains.exposed.v1.core.ResultRow
import org.jetbrains.exposed.sql.Op import org.jetbrains.exposed.v1.core.eq
import org.jetbrains.exposed.sql.ResultRow import org.jetbrains.exposed.v1.core.statements.UpdateBuilder
import org.jetbrains.exposed.sql.statements.UpdateBuilder import org.jetbrains.exposed.v1.jdbc.Database
import java.io.File import java.io.File
import kotlin.test.AfterTest import kotlin.test.AfterTest
import kotlin.test.BeforeTest import kotlin.test.BeforeTest
@@ -22,10 +22,10 @@ class ExposedKeyValuesRepoTests : CommonKeyValuesRepoTests() {
override val ResultRow.asKey: String override val ResultRow.asKey: String
get() = get(keyColumn) get() = get(keyColumn)
override val selectByValue: ISqlExpressionBuilder.(String) -> Op<Boolean> = { dataColumn.eq(it) } override val selectByValue: (String) -> Op<Boolean> = { dataColumn.eq(it) }
override val ResultRow.asObject: String override val ResultRow.asObject: String
get() = get(dataColumn) get() = get(dataColumn)
override val selectById: ISqlExpressionBuilder.(String) -> Op<Boolean> = { keyColumn.eq(it) } override val selectById: (String) -> Op<Boolean> = { keyColumn.eq(it) }
init { init {
initTable() initTable()