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

Fix SSO table initialization.

Browse source
This commit is contained in:
Tommie Gannert 2022-05-25 18:32:03 +02:00
parent 58233c790a
commit 73e83c2b51
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
userapi/storage/postgres/storage.go
View file

@ -94,6 +94,10 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
if err != nil { if err != nil {
return nil, fmt.Errorf("NewPostgresNotificationTable: %w", err) return nil, fmt.Errorf("NewPostgresNotificationTable: %w", err)
} }
ssoTable, err := NewPostgresSSOTable(db)
if err != nil {
return nil, fmt.Errorf("NewPostgresSSOTable: %w", err)
}
statsTable, err := NewPostgresStatsTable(db, serverName) statsTable, err := NewPostgresStatsTable(db, serverName)
if err != nil { if err != nil {
return nil, fmt.Errorf("NewPostgresStatsTable: %w", err) return nil, fmt.Errorf("NewPostgresStatsTable: %w", err)
@ -110,6 +114,7 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
ThreePIDs: threePIDTable, ThreePIDs: threePIDTable,
Pushers: pusherTable, Pushers: pusherTable,
Notifications: notificationsTable, Notifications: notificationsTable,
SSOs: ssoTable,
Stats: statsTable, Stats: statsTable,
ServerName: serverName, ServerName: serverName,
DB: db, DB: db,

5
userapi/storage/sqlite3/storage.go
View file

@ -95,6 +95,10 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
if err != nil { if err != nil {
return nil, fmt.Errorf("NewPostgresNotificationTable: %w", err) return nil, fmt.Errorf("NewPostgresNotificationTable: %w", err)
} }
ssoTable, err := NewSQLiteSSOTable(db)
if err != nil {
return nil, fmt.Errorf("NewSQLiteSSOTable: %w", err)
}
statsTable, err := NewSQLiteStatsTable(db, serverName) statsTable, err := NewSQLiteStatsTable(db, serverName)
if err != nil { if err != nil {
return nil, fmt.Errorf("NewSQLiteStatsTable: %w", err) return nil, fmt.Errorf("NewSQLiteStatsTable: %w", err)
@ -111,6 +115,7 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
ThreePIDs: threePIDTable, ThreePIDs: threePIDTable,
Pushers: pusherTable, Pushers: pusherTable,
Notifications: notificationsTable, Notifications: notificationsTable,
SSOs: ssoTable,
Stats: statsTable, Stats: statsTable,
ServerName: serverName, ServerName: serverName,
DB: db, DB: db,