Merge pull request #75 from InsanusMokrassar/0.5.11

0.5.11

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.5.11
+
+* `Repos`:
+    * `Common`:
+        * Fixes in `WriteOneToManyRepo#add`
+    * `Exposed`:
+        * Fixes in `ExposedOneToManyKeyValueRepo#add`
+
 ## 0.5.10
 
 * `Versions`

gradle.properties

@@ -45,5 +45,5 @@ dokka_version=1.4.32
 # Project data
 
 group=dev.inmo
-version=0.5.10
+version=0.5.11
-android_code_version=51
+android_code_version=52

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt

@@ -55,6 +55,17 @@ class OneToManyAndroidRepo<Key, Value>(
         helper.blockingWritableTransaction {
             for ((k, values) in toAdd) {
                 values.forEach { v ->
+                    val kAsString = k.keyAsString()
+                    val vAsString = v.valueAsString()
+                    val isThere = select(tableName,
+                        null,
+                        "$idColumnName=? AND $valueColumnName=?",
+                        arrayOf(kAsString, vAsString),
+                        limit = limitClause(1)
+                    ).use { it.moveToFirst() }
+                    if (isThere) {
+                        return@forEach
+                    }
                     insert(
                         tableName,
                         null,

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt

@@ -31,6 +31,9 @@ open class ExposedOneToManyKeyValueRepo<Key, Value>(
         transaction(database) {
             toAdd.keys.flatMap { k ->
                 toAdd[k] ?.mapNotNull { v ->
+                    if (select { keyColumn.eq(k).and(valueColumn.eq(v)) }.limit(1).count() > 0) {
+                        return@mapNotNull null
+                    }
                     insertIgnore {
                         it[keyColumn] = k
                         it[valueColumn] = v