Merge branch 'store-refactor-schemes' into 'master'

[Store] Make scheme more generic

See merge request famedly/famedlysdk!61

lib/src/Store.dart

@@ -55,7 +55,7 @@ class Store {
   _init() async {
     var databasePath = await getDatabasesPath();
     String path = p.join(databasePath, "FluffyMatrix.db");
-    _db = await openDatabase(path, version: 8,
+    _db = await openDatabase(path, version: 10,
         onCreate: (Database db, int version) async {
       await createTables(db);
     }, onUpgrade: (Database db, int oldVersion, int newVersion) async {
@@ -63,11 +63,9 @@ class Store {
         print(
             "[Store] Migrate databse from version $oldVersion to $newVersion");
       if (oldVersion != newVersion) {
-        await db.execute("DROP TABLE IF EXISTS Rooms");
+        await schemes.forEach((String name, String scheme) async {
-        await db.execute("DROP TABLE IF EXISTS Participants");
+          await db.execute("DROP TABLE IF EXISTS $name");
-        await db.execute("DROP TABLE IF EXISTS Users");
+        });
-        await db.execute("DROP TABLE IF EXISTS Events");
-        await db.execute("DROP TABLE IF EXISTS NotificationsCache");
         db.rawUpdate("UPDATE Clients SET prev_batch='' WHERE client=?",
             [client.clientName]);
         await createTables(db);
@@ -99,11 +97,9 @@ class Store {
   }
 
   Future<void> createTables(Database db) async {
-    await db.execute(ClientsScheme);
+    await schemes.forEach((String name, String scheme) async {
-    await db.execute(RoomsScheme);
+      await db.execute(scheme);
-    await db.execute(UserScheme);
+    });
-    await db.execute(EventsScheme);
-    await db.execute(NotificationsCacheScheme);
   }
 
   Future<String> queryPrevBatch() async {
@@ -133,9 +129,9 @@ class Store {
   Future<void> clear() async {
     await _db
         .rawDelete("DELETE FROM Clients WHERE client=?", [client.clientName]);
-    await _db.rawDelete("DELETE FROM Rooms");
+    await schemes.forEach((String name, String scheme) async {
-    await _db.rawDelete("DELETE FROM Users");
+      if (name != "Clients") await db.rawDelete("DELETE FROM $name");
-    await _db.rawDelete("DELETE FROM Events");
+    });
     return;
   }
 
@@ -674,8 +670,9 @@ class Store {
     return res;
   }
 
+  static final Map<String, String> schemes = {
     /// The database scheme for the Client class.
-  static final String ClientsScheme = 'CREATE TABLE IF NOT EXISTS Clients(' +
+    "Clients": 'CREATE TABLE IF NOT EXISTS Clients(' +
         'client TEXT PRIMARY KEY, ' +
         'token TEXT, ' +
         'homeserver TEXT, ' +
@@ -685,10 +682,10 @@ class Store {
         'prev_batch TEXT, ' +
         'matrix_versions TEXT, ' +
         'lazy_load_members INTEGER, ' +
-      'UNIQUE(client))';
+        'UNIQUE(client))',
 
     /// The database scheme for the Room class.
-  static final String RoomsScheme = 'CREATE TABLE IF NOT EXISTS Rooms(' +
+    "Rooms": 'CREATE TABLE IF NOT EXISTS Rooms(' +
         'id TEXT PRIMARY KEY, ' +
         'membership TEXT, ' +
         'topic TEXT, ' +
@@ -725,10 +722,10 @@ class Store {
         'power_event_aliases INTEGER, ' +
         'power_event_name INTEGER, ' +
         'power_event_power_levels INTEGER, ' +
-      'UNIQUE(id))';
+        'UNIQUE(id))',
 
     /// The database scheme for the Event class.
-  static final String EventsScheme = 'CREATE TABLE IF NOT EXISTS Events(' +
+    "Events": 'CREATE TABLE IF NOT EXISTS Events(' +
         'id TEXT PRIMARY KEY, ' +
         'chat_id TEXT, ' +
         'origin_server_ts INTEGER, ' +
@@ -738,23 +735,23 @@ class Store {
         'type TEXT, ' +
         'content_json TEXT, ' +
         "status INTEGER, " +
-      'UNIQUE(id))';
+        'UNIQUE(id))',
 
     /// The database scheme for the User class.
-  static final String UserScheme = 'CREATE TABLE IF NOT EXISTS Users(' +
+    "Users": 'CREATE TABLE IF NOT EXISTS Users(' +
         'chat_id TEXT, ' + // The chat id of this membership
         'matrix_id TEXT, ' + // The matrix id of this user
         'displayname TEXT, ' +
         'avatar_url TEXT, ' +
         'membership TEXT, ' + // The status of the membership. Must be one of [join, invite, ban, leave]
         'power_level INTEGER, ' + // The power level of this user. Must be in [0,..,100]
-      'UNIQUE(chat_id, matrix_id))';
+        'UNIQUE(chat_id, matrix_id))',
 
     /// The database scheme for the NotificationsCache class.
-  static final String NotificationsCacheScheme =
+    "NotificationsCache": 'CREATE TABLE IF NOT EXISTS NotificationsCache(' +
-      'CREATE TABLE IF NOT EXISTS NotificationsCache(' +
         'id int PRIMARY KEY, ' +
         'chat_id TEXT, ' + // The chat id
         'event_id TEXT, ' + // The matrix id of the Event
-          'UNIQUE(event_id))';
+        'UNIQUE(event_id))',
+  };
 }