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

Add SQL level functions for canonical alias

Browse source
This commit is contained in:
Abhishek Kumar 2020-01-22 17:38:00 +05:30
parent d477fd198b
commit cfd8aadbbc
2 changed files with 58 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
roomserver/storage/postgres/room_canonical_aliases_table.go
View file

@ -20,108 +20,99 @@ import (
"database/sql" "database/sql"
) )
const roomAliasesSchema = ` const roomCanonicalAliasSchema = `
-- Stores room aliases and room IDs they refer to -- Stores room canonical alias and room IDs they refer to
CREATE TABLE IF NOT EXISTS roomserver_room_aliases ( CREATE TABLE IF NOT EXISTS roomserver_canonical_aliases (
-- Alias of the room -- Canonical alias of the room
alias TEXT NOT NULL PRIMARY KEY, canonical_alias TEXT NOT NULL PRIMARY KEY,
-- Room ID the alias refers to -- Room ID the canonical_alias refers to
room_id TEXT NOT NULL, room_id TEXT NOT NULL,
-- User ID of the creator of this alias -- User ID of the creator of this canonical_alias
creator_id TEXT NOT NULL creator_id TEXT NOT NULL
FOREIGN KEY (canonical_alias) REFERENCES roomserver_room_aliases(alias)
); );
CREATE INDEX IF NOT EXISTS roomserver_room_id_idx ON roomserver_room_aliases(room_id); CREATE INDEX IF NOT EXISTS roomserver_room_id_idx ON roomserver_canonical_aliases(room_id);
` `
const insertRoomAliasSQL = "" + const insertRoomCanonicalAliasSQL = "" +
"INSERT INTO roomserver_room_aliases (alias, room_id, creator_id) VALUES ($1, $2, $3)" "INSERT INTO roomserver_canonical_aliases (canonical_alias, room_id, creator_id) VALUES ($1, $2, $3)"
const selectRoomIDFromAliasSQL = "" + const selectRoomIDFromCanonicalAliasSQL = "" +
"SELECT room_id FROM roomserver_room_aliases WHERE alias = $1" "SELECT room_id FROM roomserver_canonical_aliases WHERE canonical_alias = $1"
const selectAliasesFromRoomIDSQL = "" + const selectCanonicalAliasFromRoomIDSQL = "" +
"SELECT alias FROM roomserver_room_aliases WHERE room_id = $1" "SELECT canonical_alias FROM roomserver_canonical_aliases WHERE room_id = $1"
const selectCreatorIDFromAliasSQL = "" + const selectCreatorIDFromCanonicalAliasSQL = "" +
"SELECT creator_id FROM roomserver_room_aliases WHERE alias = $1" "SELECT creator_id FROM roomserver_canonical_aliases WHERE canonical_alias = $1"
const deleteRoomAliasSQL = "" + const deleteRoomCanonicalAliasSQL = "" +
"DELETE FROM roomserver_room_aliases WHERE alias = $1" "DELETE FROM roomserver_canonical_aliases WHERE canonical_alias = $1"
type roomAliasesStatements struct { type roomCanonicalAliasStatements struct {
insertRoomAliasStmt *sql.Stmt insertRoomCanonicalAliasStmt *sql.Stmt
selectRoomIDFromAliasStmt *sql.Stmt selectRoomIDFromCanonicalAliasStmt *sql.Stmt
selectAliasesFromRoomIDStmt *sql.Stmt selectCanonicalAliasFromRoomIDStmt *sql.Stmt
selectCreatorIDFromAliasStmt *sql.Stmt selectCreaterIDFromCanonicalAliasStmt *sql.Stmt
deleteRoomAliasStmt *sql.Stmt deleteRoomCanonicalAliasStmt *sql.Stmt
} }
func (s *roomAliasesStatements) prepare(db *sql.DB) (err error) { func (s *roomCanonicalAliasStatements) prepare(db *sql.DB) (err error) {
_, err = db.Exec(roomAliasesSchema) _, err = db.Exec(roomCanonicalAliasSchema)
if err != nil { if err != nil {
return return
} }
return statementList{ return statementList{
{&s.insertRoomAliasStmt, insertRoomAliasSQL}, {&s.insertRoomCanonicalAliasStmt, insertRoomCanonicalAliasSQL},
{&s.selectRoomIDFromAliasStmt, selectRoomIDFromAliasSQL}, {&s.selectRoomIDFromCanonicalAliasStmt, selectRoomIDFromCanonicalAliasSQL},
{&s.selectAliasesFromRoomIDStmt, selectAliasesFromRoomIDSQL}, {&s.selectCanonicalAliasFromRoomIDStmt, selectCanonicalAliasFromRoomIDSQL},
{&s.selectCreatorIDFromAliasStmt, selectCreatorIDFromAliasSQL}, {&s.selectCreaterIDFromCanonicalAliasStmt, selectCreatorIDFromCanonicalAliasSQL},
{&s.deleteRoomAliasStmt, deleteRoomAliasSQL}, {&s.deleteRoomCanonicalAliasStmt, deleteRoomCanonicalAliasSQL},
}.prepare(db) }.prepare(db)
} }
func (s *roomAliasesStatements) insertRoomAlias( func (s *roomCanonicalAliasStatements) insertRoomCanonicalAlias(
ctx context.Context, alias string, roomID string, creatorUserID string, ctx context.Context, canonical_alias string, roomID string, creatorUserID string,
) (err error) { ) (err error) {
_, err = s.insertRoomAliasStmt.ExecContext(ctx, alias, roomID, creatorUserID) _, err = s.insertRoomCanonicalAliasStmt.ExecContext(ctx, canonical_alias, roomID, creatorUserID)
return return
} }
func (s *roomAliasesStatements) selectRoomIDFromAlias( func (s *roomCanonicalAliasStatements) selectRoomIDFromCanonicalAlias(
ctx context.Context, alias string, ctx context.Context, canonical_alias string,
) (roomID string, err error) { ) (roomID string, err error) {
err = s.selectRoomIDFromAliasStmt.QueryRowContext(ctx, alias).Scan(&roomID) err = s.selectRoomIDFromCanonicalAliasStmt.QueryRowContext(ctx, canonical_alias).Scan(&roomID)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return "", nil return "", nil
} }
return return
} }
func (s *roomAliasesStatements) selectAliasesFromRoomID( func (s *roomCanonicalAliasStatements) selectCanonicalAliasFromRoomID(
ctx context.Context, roomID string, ctx context.Context, roomID string,
) (aliases []string, err error) { ) (canonical_alias string, err error) {
aliases = []string{} err = s.selectCanonicalAliasFromRoomIDStmt.QueryRowContext(ctx, roomID).Scan(&canonical_alias)
rows, err := s.selectAliasesFromRoomIDStmt.QueryContext(ctx, roomID)
if err != nil {
return
}
for rows.Next() {
var alias string
if err = rows.Scan(&alias); err != nil {
return
}
aliases = append(aliases, alias)
}
return
}
func (s *roomAliasesStatements) selectCreatorIDFromAlias(
ctx context.Context, alias string,
) (creatorID string, err error) {
err = s.selectCreatorIDFromAliasStmt.QueryRowContext(ctx, alias).Scan(&creatorID)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return "", nil return "", nil
} }
return return
} }
func (s *roomAliasesStatements) deleteRoomAlias( func (s *roomCanonicalAliasStatements) selectCreatorIDFromCanonicalAlias(
ctx context.Context, alias string, ctx context.Context, canonical_alias string,
) (err error) { ) (creatorID string, err error) {
_, err = s.deleteRoomAliasStmt.ExecContext(ctx, alias) err = s.selectCreaterIDFromCanonicalAliasStmt.QueryRowContext(ctx, canonical_alias).Scan(&creatorID)
if err == sql.ErrNoRows {
return "", nil
}
return
}
func (s *roomCanonicalAliasStatements) deleteRoomCanonicalAlias(
ctx context.Context, canonical_alias string,
) (err error) {
_, err = s.deleteRoomCanonicalAliasStmt.ExecContext(ctx, canonical_alias)
return return
} }

2
roomserver/storage/postgres/sql.go
View file

@ -29,6 +29,7 @@ type statements struct {
stateBlockStatements stateBlockStatements
previousEventStatements previousEventStatements
roomAliasesStatements roomAliasesStatements
roomCanonicalStatements
inviteStatements inviteStatements
membershipStatements membershipStatements
transactionStatements transactionStatements
@ -47,6 +48,7 @@ func (s *statements) prepare(db *sql.DB) error {
s.stateBlockStatements.prepare, s.stateBlockStatements.prepare,
s.previousEventStatements.prepare, s.previousEventStatements.prepare,
s.roomAliasesStatements.prepare, s.roomAliasesStatements.prepare,
s.roomCanonicalAliasStatements.prepare,
s.inviteStatements.prepare, s.inviteStatements.prepare,
s.membershipStatements.prepare, s.membershipStatements.prepare,
s.transactionStatements.prepare, s.transactionStatements.prepare,