From 54776dc6e73d4370dec4c231b3b4e5ab99695d16 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 1 Dec 2022 11:02:31 +0100 Subject: [PATCH] Revert previous commit --- .../android/PokerAnalyticsApplication.kt | 2 +- .../model/migrations/PokerAnalyticsMigration.kt | 13 +++++++++++++ .../pokeranalytics/android/model/realm/Result.kt | 6 ++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index f1a07f24..6d4f240f 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -54,7 +54,7 @@ class PokerAnalyticsApplication : Application() { Realm.init(this) val realmConfiguration = RealmConfiguration.Builder() .name(Realm.DEFAULT_REALM_NAME) - .schemaVersion(14) + .schemaVersion(15) // .allowWritesOnUiThread(true) .migration(PokerAnalyticsMigration()) .initialData(Seed(this)) diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt index 93f7d03c..9ed55aab 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt @@ -335,6 +335,19 @@ class PokerAnalyticsMigration : RealmMigration { currentVersion++ } + // Migrate to version 15 + if (currentVersion == 14) { +// schema.get("ComputableResult")?.let { crs -> +// crs.addField("id", String::class.java).setRequired("id", true) +// crs.addPrimaryKey("id") +// } + schema.get("Result")?.let { crs -> + crs.addField("id", String::class.java).setRequired("id", true) + crs.addPrimaryKey("id") + } + currentVersion++ + } + } override fun equals(other: Any?): Boolean { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt index f0875e48..facf5f5a 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt @@ -4,10 +4,12 @@ import io.realm.RealmList import io.realm.RealmObject import io.realm.RealmResults import io.realm.annotations.LinkingObjects +import io.realm.annotations.PrimaryKey import io.realm.annotations.RealmClass import net.pokeranalytics.android.exceptions.PADataModelException import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.QueryCondition +import java.util.* @RealmClass open class Result : RealmObject(), Filterable { @@ -23,8 +25,8 @@ open class Result : RealmObject(), Filterable { } -// @PrimaryKey -// var id = UUID.randomUUID().toString() + @PrimaryKey + var id = UUID.randomUUID().toString() /** * The buyin amount