From d661fb428976907020eef44df700def026ef312d Mon Sep 17 00:00:00 2001
From: Christian Pauly <Christian-pauly@posteo.de>
Date: Thu, 8 Aug 2019 14:13:32 +0200
Subject: [PATCH] [Store] Fix more queries

---
 lib/src/Store.dart | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/Store.dart b/lib/src/Store.dart
index 3afdc2b..acb55b0 100644
--- a/lib/src/Store.dart
+++ b/lib/src/Store.dart
@@ -156,8 +156,8 @@ class Store {
   }
 
   Future<void> storeRoomPrevBatch(Room room) async {
-    await _db.rawUpdate(
-        "UPDATE Rooms SET prev_batch=? WHERE id=?", [room.prev_batch, room.id]);
+    await _db.rawUpdate("UPDATE Rooms SET prev_batch=? WHERE room_id=?",
+        [room.prev_batch, room.id]);
     return null;
   }
 
@@ -189,7 +189,7 @@ class Store {
       updateQuery += ", heroes=?";
       updateArgs.add(roomUpdate.summary.mHeroes.join(","));
     }
-    updateQuery += " WHERE id=?";
+    updateQuery += " WHERE room_id=?";
     updateArgs.add(roomUpdate.id);
     txn.rawUpdate(updateQuery, updateArgs);
 
@@ -343,7 +343,7 @@ class Store {
         "SELECT * " +
             " FROM Events " +
             " WHERE room_id=?" +
-            " GROUP BY id " +
+            " GROUP BY event_id " +
             " ORDER BY origin_server_ts DESC",
         [room.id]);
 
@@ -379,7 +379,7 @@ class Store {
   /// Returns a room without events and participants.
   Future<Room> getRoomById(String id) async {
     List<Map<String, dynamic>> res =
-        await db.rawQuery("SELECT * FROM Rooms WHERE id=?", [id]);
+        await db.rawQuery("SELECT * FROM Rooms WHERE room_id=?", [id]);
     if (res.length != 1) return null;
     return Room.getRoomFromTableRow(res[0], client,
         states: getStatesFromRoomId(id));
@@ -390,7 +390,7 @@ class Store {
   }
 
   Future<void> forgetRoom(String roomID) async {
-    await db.rawDelete("DELETE FROM Rooms WHERE id=?", [roomID]);
+    await db.rawDelete("DELETE FROM Rooms WHERE room_id=?", [roomID]);
     return;
   }