From 6801057919a915c19b89600acfd256417b7020b3 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 24 Apr 2019 17:33:26 +0200 Subject: [PATCH 1/5] update realm migration for FilterCondition --- .../model/migrations/PokerAnalyticsMigration.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 4a1b109b..608792bb 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 @@ -59,9 +59,13 @@ class PokerAnalyticsMigration : RealmMigration { schema.get("FilterCondition")?.let { it.removeField("blindValues") - it.addField("operator", Int::class.java).setNullable("operator", true) - it.addField("intValue", Int::class.java).setNullable("intValue", true) - it.addField("doubleValue", Double::class.java).setNullable("intValue", true) + it.removeField("numericValues") + + it.addField("operator", Integer::class.java).setNullable("operator", true) + it.addField("intValue", Integer::class.java).setNullable("intValue", true) + it.addRealmListField("intValues", Integer::class.java).setNullable("intValues", true) + it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true) + it.addRealmListField("doubleValues", Double::class.java).setNullable("doubleValues", true) it.addField("stringValue", String::class.java).setNullable("stringValue", true) } From 244151f2cb42f5b0171192739cab0ddd807a4efc Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 24 Apr 2019 17:45:10 +0200 Subject: [PATCH 2/5] update realm migration for FilterCondition --- .../model/migrations/PokerAnalyticsMigration.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 608792bb..819d357f 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 @@ -61,12 +61,12 @@ class PokerAnalyticsMigration : RealmMigration { it.removeField("blindValues") it.removeField("numericValues") - it.addField("operator", Integer::class.java).setNullable("operator", true) - it.addField("intValue", Integer::class.java).setNullable("intValue", true) - it.addRealmListField("intValues", Integer::class.java).setNullable("intValues", true) - it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true) - it.addRealmListField("doubleValues", Double::class.java).setNullable("doubleValues", true) - it.addField("stringValue", String::class.java).setNullable("stringValue", true) + it.addField("operator", Integer::class.java) + it.addField("intValue", Integer::class.java) + it.addRealmListField("intValues", Integer::class.java) + it.addField("doubleValue", Double::class.java) + it.addRealmListField("doubleValues", Double::class.java) + it.addField("stringValue", String::class.java) } schema.get("ComputableResult")?.let { From d95371061f47bfa18de1a5d9d0aecf5ad5a25de0 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 24 Apr 2019 17:56:12 +0200 Subject: [PATCH 3/5] update realm migration for FilterCondition --- .../android/model/migrations/PokerAnalyticsMigration.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 819d357f..7c3cfeec 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 @@ -64,8 +64,8 @@ class PokerAnalyticsMigration : RealmMigration { it.addField("operator", Integer::class.java) it.addField("intValue", Integer::class.java) it.addRealmListField("intValues", Integer::class.java) - it.addField("doubleValue", Double::class.java) - it.addRealmListField("doubleValues", Double::class.java) + it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true) + it.addRealmListField("doubleValues", Double::class.java).setNullable("doubleValue", true) it.addField("stringValue", String::class.java) } @@ -74,7 +74,7 @@ class PokerAnalyticsMigration : RealmMigration { } schema.get("Bankroll")?.let { - it.addField("initialValue", Double::class.java).setRequired("initialValue", true) + it.addField("initialValue", Double::class.java) } currentVersion++ From e76a30acb622d9bff6a1f045e8849c3d87414ce4 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 24 Apr 2019 18:08:40 +0200 Subject: [PATCH 4/5] update realm migration for FilterCondition --- .../android/model/migrations/PokerAnalyticsMigration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7c3cfeec..32d9436e 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 @@ -65,7 +65,7 @@ class PokerAnalyticsMigration : RealmMigration { it.addField("intValue", Integer::class.java) it.addRealmListField("intValues", Integer::class.java) it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true) - it.addRealmListField("doubleValues", Double::class.java).setNullable("doubleValue", true) + it.addRealmListField("doubleValues", Double::class.java) it.addField("stringValue", String::class.java) } From bd7b4b22dc5db4ac459dd15f61e83f10d7727df7 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 24 Apr 2019 18:19:54 +0200 Subject: [PATCH 5/5] update realm migration for FilterCondition --- .../model/migrations/PokerAnalyticsMigration.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 32d9436e..81fb9afe 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 @@ -4,6 +4,9 @@ import io.realm.DynamicRealm import io.realm.RealmMigration import timber.log.Timber import java.util.* +import io.realm.RealmObjectSchema + + class PokerAnalyticsMigration : RealmMigration { @@ -39,7 +42,6 @@ class PokerAnalyticsMigration : RealmMigration { schema.rename("FilterElement", "FilterCondition") schema.get("Filter")?.let { it.renameField("filterElements", "filterConditions") - it.removeField("entityType") } schema.get("SessionSet")?.let { it.addField("id", String::class.java).setRequired("id", true) @@ -53,6 +55,10 @@ class PokerAnalyticsMigration : RealmMigration { Timber.d("*** Running migration ${currentVersion + 1}") schema.rename("Report", "ReportSetup") + schema.get("Filter")?.let { + it.removeField("entityType") + } + schema.get("Session")?.let { it.addField("blinds", String::class.java) } @@ -66,6 +72,9 @@ class PokerAnalyticsMigration : RealmMigration { it.addRealmListField("intValues", Integer::class.java) it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true) it.addRealmListField("doubleValues", Double::class.java) + if(it.isRequired("doubleValues")) { + it.setRequired("doubleValues", false) + } it.addField("stringValue", String::class.java) }