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

Fix migrations

Browse source
This commit is contained in:
Till Faelligen 2022-07-18 13:53:43 +02:00
parent 9eb23a5f71
commit 6a3dd9e890
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
syncapi/storage/postgres/syncserver.go
View file

@ -46,11 +46,10 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions)
if _, err = d.db.Exec(outputRoomEventsSchema); err != nil { if _, err = d.db.Exec(outputRoomEventsSchema); err != nil {
logrus.Fatalf("unable to create table: %s", err) logrus.Fatalf("unable to create table: %s", err)
} }
accountData, err := NewPostgresAccountDataTable(d.db) if _, err = d.db.Exec(currentRoomStateSchema); err != nil {
if err != nil { logrus.Fatalf("unable to create table: %s", err)
return nil, err
} }
currState, err := NewPostgresCurrentRoomStateTable(d.db) accountData, err := NewPostgresAccountDataTable(d.db)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -105,10 +104,15 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions)
if err = m.RunDeltas(d.db, dbProperties); err != nil { if err = m.RunDeltas(d.db, dbProperties); err != nil {
return nil, err return nil, err
} }
// prepare statements after the migrations have run
events, err := NewPostgresEventsTable(d.db) events, err := NewPostgresEventsTable(d.db)
if err != nil { if err != nil {
return nil, err return nil, err
} }
currState, err := NewPostgresCurrentRoomStateTable(d.db)
if err != nil {
return nil, err
}
d.Database = shared.Database{ d.Database = shared.Database{
DB: d.db, DB: d.db,
Writer: d.writer, Writer: d.writer,

12
syncapi/storage/sqlite3/syncserver.go
View file

@ -56,11 +56,10 @@ func (d *SyncServerDatasource) prepare(dbProperties *config.DatabaseOptions) (er
if _, err = d.db.Exec(outputRoomEventsSchema); err != nil { if _, err = d.db.Exec(outputRoomEventsSchema); err != nil {
logrus.Fatalf("unable to create table: %s", err) logrus.Fatalf("unable to create table: %s", err)
} }
accountData, err := NewSqliteAccountDataTable(d.db, &d.streamID) if _, err = d.db.Exec(currentRoomStateSchema); err != nil {
if err != nil { logrus.Fatalf("unable to create table: %s", err)
return err
} }
roomState, err := NewSqliteCurrentRoomStateTable(d.db, &d.streamID) accountData, err := NewSqliteAccountDataTable(d.db, &d.streamID)
if err != nil { if err != nil {
return err return err
} }
@ -115,10 +114,15 @@ func (d *SyncServerDatasource) prepare(dbProperties *config.DatabaseOptions) (er
if err = m.RunDeltas(d.db, dbProperties); err != nil { if err = m.RunDeltas(d.db, dbProperties); err != nil {
return err return err
} }
// prepare statements after the migrations have run
events, err := NewSqliteEventsTable(d.db, &d.streamID) events, err := NewSqliteEventsTable(d.db, &d.streamID)
if err != nil { if err != nil {
return err return err
} }
roomState, err := NewSqliteCurrentRoomStateTable(d.db, &d.streamID)
if err != nil {
return err
}
d.Database = shared.Database{ d.Database = shared.Database{
DB: d.db, DB: d.db,
Writer: d.writer, Writer: d.writer,