fix migration off options table for current profile

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / db / DB.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/db/DB.java b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
index 7e7ca4278d7c2460b0700d69643716d9ca19199a..3a236944e8969e3c3244acf869faee0035fafbcc 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/db/DB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
@@ -33,7 +33,6 @@ import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.dao.AccountDAO;
 import net.ktnx.mobileledger.dao.AccountValueDAO;
 import net.ktnx.mobileledger.dao.CurrencyDAO;
-import net.ktnx.mobileledger.dao.DescriptionHistoryDAO;
 import net.ktnx.mobileledger.dao.OptionDAO;
 import net.ktnx.mobileledger.dao.ProfileDAO;
 import net.ktnx.mobileledger.dao.TemplateAccountDAO;
@@ -54,11 +53,11 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 @Database(version = DB.REVISION,
           entities = {TemplateHeader.class, TemplateAccount.class, Currency.class, Account.class,
-                      Profile.class, Option.class, AccountValue.class, DescriptionHistory.class,
-                      Transaction.class, TransactionAccount.class
+                      Profile.class, Option.class, AccountValue.class, Transaction.class,
+                      TransactionAccount.class
           })
 abstract public class DB extends RoomDatabase {
-    public static final int REVISION = 59;
+    public static final int REVISION = 60;
     public static final String DB_NAME = "MoLe.db";
     public static final MutableLiveData<Boolean> initComplete = new MutableLiveData<>(false);
     private static DB instance;
@@ -77,7 +76,8 @@ abstract public class DB extends RoomDatabase {
                                     multiVersionMigration(20, 22), multiVersionMigration(22, 30),
                                     multiVersionMigration(30, 32), multiVersionMigration(32, 34),
                                     multiVersionMigration(34, 40), singleVersionMigration(41),
-                                    multiVersionMigration(41, 58), singleVersionMigration(59)
+                                    multiVersionMigration(41, 58), singleVersionMigration(59),
+                                    singleVersionMigration(60)
                     })
                    .addCallback(new Callback() {
                        @Override
@@ -108,8 +108,8 @@ abstract public class DB extends RoomDatabase {
                 // SharedPreferences
                 if (toVersion == 59) {
                     try (Cursor c = db.query(
-                            "SELECT p.id, p.theme_hue FROM profiles p WHERE p.id=(SELECT o.value " +
-                            "FROM options WHERE o.profile_uid IS NULL AND o.name=?",
+                            "SELECT p.id, p.theme FROM profiles p WHERE p.id=(SELECT o.value " +
+                            "FROM options o WHERE o.profile_id=0 AND o.name=?)",
                             new Object[]{"profile_id"}))
                     {
                         if (c.moveToFirst()) {
@@ -214,7 +214,5 @@ abstract public class DB extends RoomDatabase {
 
     public abstract OptionDAO getOptionDAO();
 
-    public abstract DescriptionHistoryDAO getDescriptionHistoryDAO();
-
     public abstract ProfileDAO getProfileDAO();
 }