mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-10 23:53:09 -06:00
More cleanup
This commit is contained in:
parent
17fee30c0e
commit
53885048a8
|
|
@ -29,20 +29,12 @@ func newOutputRoomEventsTable(t *testing.T, dbType test.DBType) (tables.Events,
|
||||||
var tab tables.Events
|
var tab tables.Events
|
||||||
switch dbType {
|
switch dbType {
|
||||||
case test.DBTypePostgres:
|
case test.DBTypePostgres:
|
||||||
_, err = postgres.NewPostgresTopologyTable(db) // needed, since there is a join on it
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("unable to create table: %s", err)
|
|
||||||
}
|
|
||||||
tab, err = postgres.NewPostgresEventsTable(db)
|
tab, err = postgres.NewPostgresEventsTable(db)
|
||||||
case test.DBTypeSQLite:
|
case test.DBTypeSQLite:
|
||||||
var stream sqlite3.StreamIDStatements
|
var stream sqlite3.StreamIDStatements
|
||||||
if err = stream.Prepare(db); err != nil {
|
if err = stream.Prepare(db); err != nil {
|
||||||
t.Fatalf("failed to prepare stream stmts: %s", err)
|
t.Fatalf("failed to prepare stream stmts: %s", err)
|
||||||
}
|
}
|
||||||
_, err = sqlite3.NewSqliteTopologyTable(db) // needed, since there is a join on it
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("unable to create table: %s", err)
|
|
||||||
}
|
|
||||||
tab, err = sqlite3.NewSqliteEventsTable(db, &stream)
|
tab, err = sqlite3.NewSqliteEventsTable(db, &stream)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -500,7 +500,6 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
|
||||||
}
|
}
|
||||||
|
|
||||||
jr.Timeline.PrevBatch = prevBatch
|
jr.Timeline.PrevBatch = prevBatch
|
||||||
|
|
||||||
jr.Timeline.Events = gomatrixserverlib.HeaderedToClientEvents(events, gomatrixserverlib.FormatSync)
|
jr.Timeline.Events = gomatrixserverlib.HeaderedToClientEvents(events, gomatrixserverlib.FormatSync)
|
||||||
jr.Timeline.Limited = limited
|
jr.Timeline.Limited = limited
|
||||||
jr.State.Events = gomatrixserverlib.HeaderedToClientEvents(stateEvents, gomatrixserverlib.FormatSync)
|
jr.State.Events = gomatrixserverlib.HeaderedToClientEvents(stateEvents, gomatrixserverlib.FormatSync)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue