X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdb%2FDB.java;h=630c5b272a64002061908d5db2cac881021b6f72;hp=9a73f4d45601bae8be56287325d474637e917ff0;hb=b2f4ea6b9b96cda1c04afc54c152049025d99d80;hpb=0d9563b422ebc47fb57753e812c68bbbb1d4a8f2

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 9a73f4d4..630c5b27 100644
--- a/app/src/main/java/net/ktnx/mobileledger/db/DB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
@@ -25,12 +25,17 @@ import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 
 import net.ktnx.mobileledger.App;
+import net.ktnx.mobileledger.dao.AccountDAO;
 import net.ktnx.mobileledger.dao.CurrencyDAO;
 import net.ktnx.mobileledger.dao.TemplateAccountDAO;
 import net.ktnx.mobileledger.dao.TemplateHeaderDAO;
 import net.ktnx.mobileledger.utils.MobileLedgerDatabase;
 
-@Database(version = 54, entities = {TemplateHeader.class, TemplateAccount.class, Currency.class})
+@Database(version = 58,
+          entities = {TemplateHeader.class, TemplateAccount.class, Currency.class, Account.class,
+                      Profile.class, Option.class, AccountValue.class, DescriptionHistory.class,
+                      Transaction.class
+          })
 abstract public class DB extends RoomDatabase {
     private static DB instance;
     public static DB get() {
@@ -119,6 +124,41 @@ abstract public class DB extends RoomDatabase {
                                 db.execSQL("drop table pattern_accounts");
                                 db.execSQL("drop table patterns");
                             }
+                        }, new Migration(54, 55) {
+                            @Override
+                            public void migrate(@NonNull SupportSQLiteDatabase db) {
+                                db.execSQL(
+                                        "CREATE TABLE template_accounts_new (id INTEGER PRIMARY " +
+                                        "KEY " +
+                                        "AUTOINCREMENT NOT NULL, template_id INTEGER NOT NULL, " +
+                                        "acc TEXT, position INTEGER NOT NULL, acc_match_group " +
+                                        "INTEGER, currency INTEGER, currency_match_group INTEGER," +
+                                        " amount REAL, amount_match_group INTEGER, comment TEXT, " +
+                                        "comment_match_group INTEGER, negate_amount INTEGER, " +
+                                        "FOREIGN KEY(template_id) REFERENCES templates(id) ON " +
+                                        "UPDATE RESTRICT ON DELETE CASCADE , FOREIGN KEY" +
+                                        "(currency) REFERENCES currencies(id) ON UPDATE RESTRICT" +
+                                        " ON DELETE RESTRICT)");
+                                db.execSQL(
+                                        "insert into template_accounts_new(id, template_id, acc, " +
+                                        "position, acc_match_group, currency, " +
+                                        "currency_match_group, amount, amount_match_group, " +
+                                        "amount, amount_match_group, comment, " +
+                                        "comment_match_group, negate_amount) select id, " +
+                                        "template_id, acc, position, acc_match_group, " +
+                                        "currency, " +
+                                        "currency_match_group, amount, amount_match_group, " +
+                                        "amount, amount_match_group, comment, " +
+                                        "comment_match_group, negate_amount from " +
+                                        "template_accounts");
+                                db.execSQL("drop table template_accounts");
+                                db.execSQL("alter table template_accounts_new rename to " +
+                                           "template_accounts");
+                                db.execSQL("create index fk_template_accounts_template on " +
+                                           "template_accounts(template_id)");
+                                db.execSQL("create index fk_template_accounts_currency on " +
+                                           "template_accounts(currency)");
+                            }
                         }
                         })
                         .addCallback(new Callback() {
@@ -131,9 +171,11 @@ abstract public class DB extends RoomDatabase {
                         .build();
         }
     }
-    public abstract TemplateHeaderDAO getPatternDAO();
+    public abstract TemplateHeaderDAO getTemplateDAO();
 
-    public abstract TemplateAccountDAO getPatternAccountDAO();
+    public abstract TemplateAccountDAO getTemplateAccountDAO();
 
     public abstract CurrencyDAO getCurrencyDAO();
+
+    public abstract AccountDAO getAccountDAO();
 }