From 7dcde6a5ef320e9748c0ec20369e6e46bdac7985 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 9 Jan 2022 15:11:33 +0100 Subject: [PATCH] Fixed account view migration (2) --- app/src/main/java/eu/faircode/email/DB.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java index cdea0173cf..4cc5727200 100644 --- a/app/src/main/java/eu/faircode/email/DB.java +++ b/app/src/main/java/eu/faircode/email/DB.java @@ -1604,11 +1604,8 @@ public abstract class DB extends RoomDatabase { @Override public void migrate(@NonNull SupportSQLiteDatabase db) { logMigration(startVersion, endVersion); - try { - db.execSQL("CREATE VIEW IF NOT EXISTS `account_view` AS " + TupleAccountView.query); - } catch (Throwable ex) { - Log.w(ex); - } + db.execSQL("CREATE VIEW IF NOT EXISTS `account_view` AS " + + TupleAccountView.query.replace(", category", "")); db.execSQL("CREATE VIEW IF NOT EXISTS `identity_view` AS " + TupleIdentityView.query); db.execSQL("CREATE VIEW IF NOT EXISTS `folder_view` AS " + TupleFolderView.query); } @@ -2148,12 +2145,9 @@ public abstract class DB extends RoomDatabase { @Override public void migrate(@NonNull SupportSQLiteDatabase db) { logMigration(startVersion, endVersion); - try { - db.execSQL("DROP VIEW IF EXISTS `account_view`"); - db.execSQL("CREATE VIEW IF NOT EXISTS `account_view` AS " + TupleAccountView.query); - } catch (Throwable ex) { - Log.w(ex); - } + db.execSQL("DROP VIEW IF EXISTS `account_view`"); + db.execSQL("CREATE VIEW IF NOT EXISTS `account_view` AS " + + TupleAccountView.query.replace(", category", "")); } }).addMigrations(new Migration(207, 208) { @Override