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

Merge remote-tracking branch 'origin/master' into markjh/invites

Browse source
This commit is contained in:
Mark Haines 2017-08-02 16:51:34 +01:00
parent 8fafe14f47 3b07633326
commit 63b58d1aff
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
View file

@ -27,9 +27,9 @@ type statements struct {
stateSnapshotStatements stateSnapshotStatements
stateBlockStatements stateBlockStatements
previousEventStatements previousEventStatements
roomAliasesStatements
inviteStatements inviteStatements
membershipStatements membershipStatements
roomAliasesStatements
} }
func (s *statements) prepare(db *sql.DB) error { func (s *statements) prepare(db *sql.DB) error {
@ -44,6 +44,7 @@ func (s *statements) prepare(db *sql.DB) error {
s.stateSnapshotStatements.prepare, s.stateSnapshotStatements.prepare,
s.stateBlockStatements.prepare, s.stateBlockStatements.prepare,
s.previousEventStatements.prepare, s.previousEventStatements.prepare,
s.roomAliasesStatements.prepare,
s.inviteStatements.prepare, s.inviteStatements.prepare,
s.membershipStatements.prepare, s.membershipStatements.prepare,
} { } {
@ -52,9 +53,5 @@ func (s *statements) prepare(db *sql.DB) error {
} }
} }
if err = s.roomAliasesStatements.prepare(db); err != nil {
return err
}
return nil return nil
} }