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

Fix appservice API

Browse source
This commit is contained in:
Neil Alexander 2020-08-20 18:14:17 +01:00
parent d855bf611f
commit c97f3d3f83
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appservice/storage/sqlite3/appservice_events_table.go
View file

@ -75,9 +75,9 @@ type eventsStatements struct {
deleteEventsBeforeAndIncludingIDStmt *sql.Stmt deleteEventsBeforeAndIncludingIDStmt *sql.Stmt
} }
func (s *eventsStatements) prepare(db *sql.DB) (err error) { func (s *eventsStatements) prepare(db *sql.DB, writer sqlutil.TransactionWriter) (err error) {
s.db = db s.db = db
s.writer = sqlutil.NewTransactionWriter() s.writer = writer
_, err = db.Exec(appserviceEventsSchema) _, err = db.Exec(appserviceEventsSchema)
if err != nil { if err != nil {
return return

4
appservice/storage/sqlite3/storage.go
View file

@ -53,11 +53,11 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*Database, error) {
} }
func (d *Database) prepare() error { func (d *Database) prepare() error {
if err := d.events.prepare(d.db); err != nil { if err := d.events.prepare(d.db, d.writer); err != nil {
return err return err
} }
return d.txnID.prepare(d.db) return d.txnID.prepare(d.db, d.writer)
} }
// StoreEvent takes in a gomatrixserverlib.HeaderedEvent and stores it in the database // StoreEvent takes in a gomatrixserverlib.HeaderedEvent and stores it in the database

4
appservice/storage/sqlite3/txn_id_counter_table.go
View file

@ -42,9 +42,9 @@ type txnStatements struct {
selectTxnIDStmt *sql.Stmt selectTxnIDStmt *sql.Stmt
} }
func (s *txnStatements) prepare(db *sql.DB) (err error) { func (s *txnStatements) prepare(db *sql.DB, writer sqlutil.TransactionWriter) (err error) {
s.db = db s.db = db
s.writer = sqlutil.NewTransactionWriter() s.writer = writer
_, err = db.Exec(txnIDSchema) _, err = db.Exec(txnIDSchema)
if err != nil { if err != nil {
return return