From 6328900d06204c16597dd8b4bf4572198075eba4 Mon Sep 17 00:00:00 2001
From: Mark Haines <mjark@negativecurvature.net>
Date: Mon, 7 Aug 2017 14:24:21 +0100
Subject: [PATCH] Namespace the tables

---
 .../dendrite/roomserver/storage/invite_table.go        | 10 +++++-----
 .../dendrite/roomserver/storage/membership_table.go    |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/invite_table.go b/src/github.com/matrix-org/dendrite/roomserver/storage/invite_table.go
index 061397557..c24c090fa 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/invite_table.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/invite_table.go
@@ -21,7 +21,7 @@ import (
 )
 
 const inviteSchema = `
-CREATE TABLE IF NOT EXISTS invites (
+CREATE TABLE IF NOT EXISTS roomserver_invites (
 	-- The string ID of the invite event itself.
 	-- We can't use a numeric event ID here because we don't always have
 	-- enough information to store an invite in the event table.
@@ -47,16 +47,16 @@ CREATE TABLE IF NOT EXISTS invites (
 	invite_event_json TEXT NOT NULL
 );
 
-CREATE INDEX IF NOT EXISTS invites_active_idx ON invites (target_nid, room_nid)
+CREATE INDEX IF NOT EXISTS roomserver_invites_active_idx ON invites (target_nid, room_nid)
 	WHERE NOT retired;
 `
 const insertInviteEventSQL = "" +
-	"INSERT INTO invites (invite_event_id, room_nid, target_nid," +
+	"INSERT INTO roomserver_invites (invite_event_id, room_nid, target_nid," +
 	" sender_nid, invite_event_json) VALUES ($1, $2, $3, $4, $5)" +
 	" ON CONFLICT DO NOTHING"
 
 const selectInviteActiveForUserInRoomSQL = "" +
-	"SELECT invite_event_id, sender_nid FROM invites" +
+	"SELECT invite_event_id, sender_nid FROM roomserver_invites" +
 	" WHERE target_nid = $1 AND room_nid = $2" +
 	" AND NOT retired"
 
@@ -66,7 +66,7 @@ const selectInviteActiveForUserInRoomSQL = "" +
 // However the matrix protocol doesn't give us a way to reliably identify the
 // invites that were retired, so we are forced to retire all of them.
 const updateInviteRetiredSQL = "" +
-	"UPDATE invites SET retired = TRUE" +
+	"UPDATE roomserver_invites SET retired = TRUE" +
 	" WHERE room_nid = $1 AND target_nid = $2 AND NOT retired" +
 	" RETURNING invite_event_id"
 
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go b/src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go
index d5f5fa324..d9eb5bad7 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go
@@ -35,7 +35,7 @@ const membershipSchema = `
 --   1) The membership of a user changes within the current state of the room.
 --   2) An invite is received outside of a room over federation. 
 --   3) An invite is rejected outside of a room over federation.
-CREATE TABLE IF NOT EXISTS membership (
+CREATE TABLE IF NOT EXISTS roomserver_membership (
 	room_nid BIGINT NOT NULL,
 	-- Numeric state key ID for the user ID this state is for.
 	target_nid BIGINT NOT NULL,
@@ -48,16 +48,16 @@ CREATE TABLE IF NOT EXISTS membership (
 `
 
 const insertMembershipSQL = "" +
-	"INSERT INTO membership (room_nid, target_nid)" +
+	"INSERT INTO roomserver_membership (room_nid, target_nid)" +
 	" VALUES ($1, $2)" +
 	" ON CONFLICT DO NOTHING"
 
 const selectMembershipForUpdateSQL = "" +
-	"SELECT membership_nid FROM membership" +
+	"SELECT membership_nid FROM roomserver_membership" +
 	" WHERE room_nid = $1 AND target_nid = $2 FOR UPDATE"
 
 const updateMembershipSQL = "" +
-	"UPDATE membership SET sender_nid = $3, membership_nid = $4" +
+	"UPDATE roomserver_membership SET sender_nid = $3, membership_nid = $4" +
 	" WHERE room_nid = $1 AND target_nid = $2"
 
 type membershipStatements struct {