mirror of
https://github.com/hoernschen/dendrite.git
synced 2024-12-27 23:48:27 +00:00
c1e16fd41e
This fixes a temporary workaround with the `selectEventsWithEventIDsSQL` queries where fields need to be artificially added to the queries so the row results match the format of the `syncapi_output_room_events` table. I made similar functions that accept row results from the `syncapi_current_room_state` table and convert them into StreamEvents without the fields that are specific to output room events. There is also a unit test in the first commit to ensure the resulting behavior doesn't change from the modified queries and functions. Fixes #601. ### Pull Request Checklist <!-- Please read docs/CONTRIBUTING.md before submitting your pull request --> * [x] I have added tests for PR _or_ I have justified why this PR doesn't need tests. * [x] Pull request includes a [sign off](https://github.com/matrix-org/dendrite/blob/main/docs/CONTRIBUTING.md#sign-off) Signed-off-by: `Ashley Nelson <fant@shley.email>` Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
88 lines
2.8 KiB
Go
88 lines
2.8 KiB
Go
package tables_test
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/postgres"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/sqlite3"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
"github.com/matrix-org/dendrite/test"
|
|
)
|
|
|
|
func newCurrentRoomStateTable(t *testing.T, dbType test.DBType) (tables.CurrentRoomState, *sql.DB, func()) {
|
|
t.Helper()
|
|
connStr, close := test.PrepareDBConnectionString(t, dbType)
|
|
db, err := sqlutil.Open(&config.DatabaseOptions{
|
|
ConnectionString: config.DataSource(connStr),
|
|
}, sqlutil.NewExclusiveWriter())
|
|
if err != nil {
|
|
t.Fatalf("failed to open db: %s", err)
|
|
}
|
|
|
|
var tab tables.CurrentRoomState
|
|
switch dbType {
|
|
case test.DBTypePostgres:
|
|
tab, err = postgres.NewPostgresCurrentRoomStateTable(db)
|
|
case test.DBTypeSQLite:
|
|
var stream sqlite3.StreamIDStatements
|
|
if err = stream.Prepare(db); err != nil {
|
|
t.Fatalf("failed to prepare stream stmts: %s", err)
|
|
}
|
|
tab, err = sqlite3.NewSqliteCurrentRoomStateTable(db, &stream)
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("failed to make new table: %s", err)
|
|
}
|
|
return tab, db, close
|
|
}
|
|
|
|
func TestCurrentRoomStateTable(t *testing.T) {
|
|
ctx := context.Background()
|
|
alice := test.NewUser(t)
|
|
room := test.NewRoom(t, alice)
|
|
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
|
tab, db, close := newCurrentRoomStateTable(t, dbType)
|
|
defer close()
|
|
events := room.CurrentState()
|
|
err := sqlutil.WithTransaction(db, func(txn *sql.Tx) error {
|
|
for i, ev := range events {
|
|
err := tab.UpsertRoomState(ctx, txn, ev, nil, types.StreamPosition(i))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to UpsertRoomState: %w", err)
|
|
}
|
|
}
|
|
wantEventIDs := []string{
|
|
events[0].EventID(), events[1].EventID(), events[2].EventID(), events[3].EventID(),
|
|
}
|
|
gotEvents, err := tab.SelectEventsWithEventIDs(ctx, txn, wantEventIDs)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to SelectEventsWithEventIDs: %w", err)
|
|
}
|
|
if len(gotEvents) != len(wantEventIDs) {
|
|
return fmt.Errorf("SelectEventsWithEventIDs\ngot %d, want %d results", len(gotEvents), len(wantEventIDs))
|
|
}
|
|
gotEventIDs := make(map[string]struct{}, len(gotEvents))
|
|
for _, event := range gotEvents {
|
|
if event.ExcludeFromSync {
|
|
return fmt.Errorf("SelectEventsWithEventIDs ExcludeFromSync should be false for current room state event %+v", event)
|
|
}
|
|
gotEventIDs[event.EventID()] = struct{}{}
|
|
}
|
|
for _, id := range wantEventIDs {
|
|
if _, ok := gotEventIDs[id]; !ok {
|
|
return fmt.Errorf("SelectEventsWithEventIDs\nexpected id %q not returned", id)
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
})
|
|
}
|