mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-04 12:43:10 -06:00
Merge branch 'main' into neilalexander/presencecompletesync
This commit is contained in:
commit
551845172a
|
|
@ -118,7 +118,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
|
||||||
|
|
||||||
var dataType string
|
var dataType string
|
||||||
var roomID string
|
var roomID string
|
||||||
var id types.StreamPosition
|
id := r.From
|
||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
if err = rows.Scan(&id, &roomID, &dataType); err != nil {
|
if err = rows.Scan(&id, &roomID, &dataType); err != nil {
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ func (s *accountDataStatements) SelectAccountDataInRange(
|
||||||
|
|
||||||
var dataType string
|
var dataType string
|
||||||
var roomID string
|
var roomID string
|
||||||
var id types.StreamPosition
|
id := r.From
|
||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
if err = rows.Scan(&id, &roomID, &dataType); err != nil {
|
if err = rows.Scan(&id, &roomID, &dataType); err != nil {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue