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 683d54b50d774cd28a045da3c873175ac5563615..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
@@ -22,6 +22,7 @@ import android.database.Cursor;
 import android.database.SQLException;
 
 import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
@@ -32,11 +33,11 @@ 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;
 import net.ktnx.mobileledger.dao.TemplateHeaderDAO;
+import net.ktnx.mobileledger.dao.TransactionAccountDAO;
 import net.ktnx.mobileledger.dao.TransactionDAO;
 import net.ktnx.mobileledger.utils.Logger;
 
@@ -52,12 +53,13 @@ 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;
     public static DB get() {
         if (instance != null)
@@ -66,30 +68,32 @@ abstract public class DB extends RoomDatabase {
             if (instance != null)
                 return instance;
 
-            return instance = Room.databaseBuilder(App.instance, DB.class, DB_NAME)
-                                  .addMigrations(new Migration[]{singleVersionMigration(17),
-                                                                 singleVersionMigration(18),
-                                                                 singleVersionMigration(19),
-                                                                 singleVersionMigration(20),
-                                                                 multiVersionMigration(20, 22),
-                                                                 multiVersionMigration(22, 30),
-                                                                 multiVersionMigration(30, 32),
-                                                                 multiVersionMigration(32, 34),
-                                                                 multiVersionMigration(34, 40),
-                                                                 singleVersionMigration(41),
-                                                                 multiVersionMigration(41, 58),
-                                                                 singleVersionMigration(59)
-                                  })
-                                  .addCallback(new Callback() {
-                                      @Override
-                                      public void onOpen(@NonNull SupportSQLiteDatabase db) {
-                                          super.onOpen(db);
-                                          db.execSQL("PRAGMA foreign_keys = ON");
-                                          db.execSQL("pragma case_sensitive_like=ON;");
-
-                                      }
-                                  })
-                                  .build();
+            RoomDatabase.Builder<DB> builder =
+                    Room.databaseBuilder(App.instance, DB.class, DB_NAME);
+            builder.addMigrations(
+                    new Migration[]{singleVersionMigration(17), singleVersionMigration(18),
+                                    singleVersionMigration(19), singleVersionMigration(20),
+                                    multiVersionMigration(20, 22), multiVersionMigration(22, 30),
+                                    multiVersionMigration(30, 32), multiVersionMigration(32, 34),
+                                    multiVersionMigration(34, 40), singleVersionMigration(41),
+                                    multiVersionMigration(41, 58), singleVersionMigration(59),
+                                    singleVersionMigration(60)
+                    })
+                   .addCallback(new Callback() {
+                       @Override
+                       public void onOpen(@NonNull SupportSQLiteDatabase db) {
+                           super.onOpen(db);
+                           db.execSQL("PRAGMA foreign_keys = ON");
+                           db.execSQL("pragma case_sensitive_like" + "=ON;");
+
+                       }
+                   });
+
+//            if (BuildConfig.DEBUG)
+//                builder.setQueryCallback(((sqlQuery, bindArgs) -> Logger.debug("room", sqlQuery)),
+//                        Executors.newSingleThreadExecutor());
+
+            return instance = builder.build();
         }
     }
     private static Migration singleVersionMigration(int toVersion) {
@@ -104,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()) {
@@ -206,9 +210,9 @@ abstract public class DB extends RoomDatabase {
 
     public abstract TransactionDAO getTransactionDAO();
 
-    public abstract OptionDAO getOptionDAO();
+    public abstract TransactionAccountDAO getTransactionAccountDAO();
 
-    public abstract DescriptionHistoryDAO getDescriptionHistoryDAO();
+    public abstract OptionDAO getOptionDAO();
 
     public abstract ProfileDAO getProfileDAO();
 }