mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 17:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQL

Browse source
This commit is contained in:
Mark Haines 2017-08-07 15:50:00 +01:00
parent fdcf72836a
commit 1ed74d4123
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/roomserver/storage/invite_table.go
View file

@ -56,7 +56,7 @@ const insertInviteEventSQL = "" +
" ON CONFLICT DO NOTHING" " ON CONFLICT DO NOTHING"
const selectInviteActiveForUserInRoomSQL = "" + const selectInviteActiveForUserInRoomSQL = "" +
"SELECT invite_event_id, sender_nid FROM roomserver_invites" + "SELECT sender_nid FROM roomserver_invites" +
" WHERE target_nid = $1 AND room_nid = $2" + " WHERE target_nid = $1 AND room_nid = $2" +
" AND NOT retired" " AND NOT retired"

11
src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go
View file

@ -23,9 +23,9 @@ import (
type membershipState int64 type membershipState int64
const ( const (
membershipStateLeaveOrBan membershipState = 0 membershipStateLeaveOrBan membershipState = 1
membershipStateInvite membershipState = 1 membershipStateInvite membershipState = 2
membershipStateJoin membershipState = 2 membershipStateJoin membershipState = 3
) )
const membershipSchema = ` const membershipSchema = `
@ -40,9 +40,12 @@ CREATE TABLE IF NOT EXISTS roomserver_membership (
-- Numeric state key ID for the user ID this state is for. -- Numeric state key ID for the user ID this state is for.
target_nid BIGINT NOT NULL, target_nid BIGINT NOT NULL,
-- Numeric state key ID for the user ID who changed the state. -- Numeric state key ID for the user ID who changed the state.
-- This may be 0 since it is not always possible to identify the user that
-- changed the state.
sender_nid BIGINT NOT NULL DEFAULT 0, sender_nid BIGINT NOT NULL DEFAULT 0,
-- The state the user is in within this room. -- The state the user is in within this room.
membership_nid BIGINT NOT NULL DEFAULT 0, -- Default value is "membershipStateLeaveOrBan"
membership_nid BIGINT NOT NULL DEFAULT 1,
UNIQUE (room_nid, target_nid) UNIQUE (room_nid, target_nid)
); );
` `