Merge pull request #992 from matrix-org/hs/postgres-entry-id

Add entry.id to postgres rooms
matrix-org · Feb 17, 2020 · 7d14b96 · 7d14b96
2 parents e00d447 + adc7037
commit 7d14b96
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/changelog.d/992.misc b/changelog.d/992.misc
@@ -0,0 +1 @@
+Ensure the room upgrades test passes with Postgres
diff --git a/src/datastore/NedbDataStore.ts b/src/datastore/NedbDataStore.ts
@@ -681,7 +681,7 @@ export class NeDBDataStore implements DataStore {
         return "ADMIN_" + userId; // clobber based on this.
     }
 
-    private static createMappingId(roomId: string, ircDomain: string, ircChannel: string) {
+    public static createMappingId(roomId: string, ircDomain: string, ircChannel: string) {
         // space as delimiter as none of these IDs allow spaces.
         return roomId + " " + ircDomain + " " + ircChannel; // clobber based on this
     }

diff --git a/src/datastore/postgres/PgDataStore.ts b/src/datastore/postgres/PgDataStore.ts
@@ -26,6 +26,7 @@ import { getLogger } from "../../logging";
 import Bluebird from "bluebird";
 import { StringCrypto } from "../StringCrypto";
 import { toIrcLowerCase } from "../../irc/formatting";
+import { NeDBDataStore } from "../NedbDataStore";
 
 const log = getLogger("PgDatastore");
 
@@ -116,7 +117,7 @@ export class PgDataStore implements DataStore {
 
     private static pgToRoomEntry(pgEntry: any): Entry {
         return {
-            id: "",
+            id: NeDBDataStore.createMappingId(pgEntry.room_id, pgEntry.irc_domain, pgEntry.irc_channel),
             matrix: new MatrixRoom(pgEntry.room_id, pgEntry.matrix_json),
             remote: new RemoteRoom("",
             {