Move every db.Prepare to sqlutil.Statementlist, remove trace driver (#3026)

Doesn't buy us much, but makes everything a bit more consistent.

Also removes the SQL trace driver, as it is unused and the output is
hard to read anyway.
This commit is contained in:
Till 2023-03-23 13:52:53 +01:00 committed by GitHub
parent cb18ba0230
commit 234ed603e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 127 additions and 451 deletions

View file

@ -19,6 +19,7 @@ import (
"database/sql"
"github.com/matrix-org/dendrite/federationapi/storage/tables"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib"
)
@ -49,10 +50,9 @@ func NewSQLiteNotaryServerKeysTable(db *sql.DB) (s *notaryServerKeysStatements,
return
}
if s.insertServerKeysJSONStmt, err = db.Prepare(insertServerKeysJSONSQL); err != nil {
return
}
return
return s, sqlutil.StatementList{
{&s.insertServerKeysJSONStmt, insertServerKeysJSONSQL},
}.Prepare(db)
}
func (s *notaryServerKeysStatements) InsertJSONResponse(