hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-03 14:42:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into neilalexander/onoldroomevent

Browse source
This commit is contained in:
Neil Alexander 2021-05-10 11:54:27 +01:00 • committed by GitHub
commit 81ad3ef5f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
151 changed files with 3603 additions and 948 deletions
Download patch file Download diff file Expand all files Collapse all files

1
syncapi/storage/sqlite3/filtering.go
View file

@ -23,7 +23,6 @@ const (
// fields might come from either a StateFilter or an EventFilter,
// and it's easier just to have the caller extract the relevant
// parts.
// nolint:gocyclo
func prepareWithFilters(
db *sql.DB, txn *sql.Tx, query string, params []interface{},
senders, notsenders, types, nottypes []string, excludeEventIDs []string,

1
syncapi/storage/sqlite3/syncserver.go
View file

@ -52,7 +52,6 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*SyncServerDatasource, e
return &d, nil
}
// nolint:gocyclo
func (d *SyncServerDatasource) prepare(dbProperties *config.DatabaseOptions) (err error) {
if err = d.PartitionOffsetStatements.Prepare(d.db, d.writer, "syncapi"); err != nil {
return err