Clear database from MRMCD 2019 on upgrade.

+ Related database state: 65048ea.
johnjohndoe · Aug 28, 2023 · 2a9b20c · 2a9b20c
1 parent 70def87
commit 2a9b20c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/...ava/info/metadude/android/eventfahrplan/database/sqliteopenhelper/AlarmsDBOpenHelper.java b/...ava/info/metadude/android/eventfahrplan/database/sqliteopenhelper/AlarmsDBOpenHelper.java
@@ -10,7 +10,7 @@
 
 public class AlarmsDBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 6;
+    private static final int DATABASE_VERSION = 8;
 
     private static final String DATABASE_NAME = "alarms";
 
@@ -62,5 +62,10 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             db.execSQL("DROP TABLE IF EXISTS " + AlarmsTable.NAME);
             onCreate(db);
         }
+        if (oldVersion < 8) {
+            // Clear database from MRMCD 2019.
+            db.execSQL("DROP TABLE IF EXISTS " + AlarmsTable.NAME);
+            onCreate(db);
+        }
     }
 }
diff --git a/.../info/metadude/android/eventfahrplan/database/sqliteopenhelper/HighlightDBOpenHelper.java b/.../info/metadude/android/eventfahrplan/database/sqliteopenhelper/HighlightDBOpenHelper.java
@@ -11,7 +11,7 @@
 
 public class HighlightDBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 5;
+    private static final int DATABASE_VERSION = 7;
 
     private static final String DATABASE_NAME = "highlight";
 

diff --git a/.../java/info/metadude/android/eventfahrplan/database/sqliteopenhelper/MetaDBOpenHelper.java b/.../java/info/metadude/android/eventfahrplan/database/sqliteopenhelper/MetaDBOpenHelper.java
@@ -12,7 +12,7 @@
 
 public class MetaDBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 8;
+    private static final int DATABASE_VERSION = 9;
 
     private static final String DATABASE_NAME = "meta";
 
@@ -64,5 +64,10 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             db.execSQL("DROP TABLE IF EXISTS " + MetasTable.NAME);
             onCreate(db);
         }
+        if (oldVersion < 9) {
+            // Clear database from MRMCD 2019.
+            db.execSQL("DROP TABLE IF EXISTS " + MetasTable.NAME);
+            onCreate(db);
+        }
     }
 }
diff --git a/...a/info/metadude/android/eventfahrplan/database/sqliteopenhelper/SessionsDBOpenHelper.java b/...a/info/metadude/android/eventfahrplan/database/sqliteopenhelper/SessionsDBOpenHelper.java
@@ -16,7 +16,7 @@
 
 public class SessionsDBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 13;
+    private static final int DATABASE_VERSION = 11;
 
     private static final String DATABASE_NAME = "lectures"; // Keep table name to avoid database migration.
 
@@ -132,20 +132,12 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (oldVersion < 10 && newVersion >= 10) {
             db.execSQL(SESSION_BY_NOTIFICATION_ID_TABLE_CREATE);
         }
-        if (oldVersion < 11 && newVersion >= 11) {
+        if (oldVersion < 11) {
             boolean columnExists = SQLiteDatabaseExtensions.columnExists(db, SessionsTable.NAME, Columns.TIME_ZONE_OFFSET);
             if (!columnExists) {
                 db.execSQL("ALTER TABLE " + SessionsTable.NAME + " ADD COLUMN " + Columns.TIME_ZONE_OFFSET + " INTEGER DEFAULT NULL");
             }
-        }
-        if (oldVersion < 12) {
-            // Clear database from rC3 12/2020.
-            db.execSQL("DROP TABLE IF EXISTS " + SessionsTable.NAME);
-            db.execSQL("DROP TABLE IF EXISTS " + SessionByNotificationIdTable.NAME);
-            onCreate(db);
-        }
-        if (oldVersion < 13) {
-            // Clear database from rC3 NOWHERE 12/2021.
+            // Clear database from MRMCD 2019.
             db.execSQL("DROP TABLE IF EXISTS " + SessionsTable.NAME);
             db.execSQL("DROP TABLE IF EXISTS " + SessionByNotificationIdTable.NAME);
             onCreate(db);