msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fixed upgrading DB triggers

Browse Source
pull/207/head
M66B 4 years ago
parent 63a65eed62
commit da4a5fd93f
1 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File

36
app/src/main/java/eu/faircode/email/DB.java
Unescape View File

@ -459,11 +459,6 @@ public abstract class DB extends RoomDatabase {
}
private static void createTriggers(@NonNull SupportSQLiteDatabase db) {
createTriggers(db, false);
}
private static void createTriggers(@NonNull SupportSQLiteDatabase db, boolean fail) {
try {
List<String> image = new ArrayList<>();
for (String img : ImageHelper.IMAGE_TYPES)
image.add("'" + img + "'");
@ -491,11 +486,6 @@ public abstract class DB extends RoomDatabase {
" AND OLD.encryption IS NULL" +
" AND NOT ((OLD.disposition = 'inline' OR (OLD.related IS NOT 0 AND OLD.cid IS NOT NULL)) AND OLD.type IN (" + images + "));" +
" END");
} catch (Throwable ex) {
Log.w(ex);
if (fail)
throw ex;
}
}
private static void logMigration(int startVersion, int endVersion) {
@ -1608,7 +1598,7 @@ public abstract class DB extends RoomDatabase {
logMigration(startVersion, endVersion);
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
createTriggers(db);
//createTriggers(db);
}
})
.addMigrations(new Migration(134, 135) {
@ -1797,9 +1787,9 @@ public abstract class DB extends RoomDatabase {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
logMigration(startVersion, endVersion);
db.execSQL("DROP TRIGGER attachment_insert");
db.execSQL("DROP TRIGGER attachment_delete");
createTriggers(db);
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
//createTriggers(db);
}
})
.addMigrations(new Migration(160, 161) {
@ -1823,18 +1813,18 @@ public abstract class DB extends RoomDatabase {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
logMigration(startVersion, endVersion);
db.execSQL("DROP TRIGGER attachment_insert");
db.execSQL("DROP TRIGGER attachment_delete");
createTriggers(db);
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
//createTriggers(db);
}
})
.addMigrations(new Migration(163, 164) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
logMigration(startVersion, endVersion);
db.execSQL("DROP TRIGGER attachment_insert");
db.execSQL("DROP TRIGGER attachment_delete");
createTriggers(db);
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
//createTriggers(db);
}
})
.addMigrations(new Migration(164, 165) {
@ -1884,7 +1874,7 @@ public abstract class DB extends RoomDatabase {
logMigration(startVersion, endVersion);
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
createTriggers(db);
//createTriggers(db);
}
})
.addMigrations(new Migration(171, 172) {
@ -2269,7 +2259,7 @@ public abstract class DB extends RoomDatabase {
db.execSQL("ALTER TABLE `attachment` ADD COLUMN `related` INTEGER");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
createTriggers(db);
//createTriggers(db);
}
}).addMigrations(new Migration(223, 224) {
@Override
@ -2297,7 +2287,7 @@ public abstract class DB extends RoomDatabase {
logMigration(startVersion, endVersion);
db.execSQL("DROP TRIGGER IF EXISTS `attachment_insert`");
db.execSQL("DROP TRIGGER IF EXISTS `attachment_delete`");
createTriggers(db, true);
createTriggers(db);
}
}).addMigrations(new Migration(227, 228) {
@Override

Write Preview
Loading…
Cancel
Save