mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-16 11:23:11 -06:00
Override named result parameters in last returns
Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
This commit is contained in:
parent
59465746bc
commit
7abd114aa4
|
|
@ -115,8 +115,7 @@ func (s *accountDataStatements) selectAccountData(
|
|||
global = append(global, ac)
|
||||
}
|
||||
}
|
||||
err = rows.Err()
|
||||
return
|
||||
return global, rooms, rows.Err()
|
||||
}
|
||||
|
||||
func (s *accountDataStatements) selectAccountDataByType(
|
||||
|
|
|
|||
|
|
@ -127,6 +127,5 @@ func (s *membershipStatements) selectMembershipsByLocalpart(
|
|||
}
|
||||
memberships = append(memberships, m)
|
||||
}
|
||||
err = rows.Err()
|
||||
return
|
||||
return memberships, rows.Err()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,8 +111,7 @@ func (s *threepidStatements) selectThreePIDsForLocalpart(
|
|||
Medium: medium,
|
||||
})
|
||||
}
|
||||
err = rows.Err()
|
||||
return
|
||||
return threepids, rows.Err()
|
||||
}
|
||||
|
||||
func (s *threepidStatements) insertThreePID(
|
||||
|
|
|
|||
|
|
@ -160,9 +160,9 @@ func (s *membershipStatements) selectMembershipsFromRoom(
|
|||
}
|
||||
eventNIDs = append(eventNIDs, eNID)
|
||||
}
|
||||
err = rows.Err()
|
||||
return
|
||||
return eventNIDs, rows.Err()
|
||||
}
|
||||
|
||||
func (s *membershipStatements) selectMembershipsFromRoomAndMembership(
|
||||
ctx context.Context,
|
||||
roomNID types.RoomNID, membership membershipState,
|
||||
|
|
@ -181,8 +181,7 @@ func (s *membershipStatements) selectMembershipsFromRoomAndMembership(
|
|||
}
|
||||
eventNIDs = append(eventNIDs, eNID)
|
||||
}
|
||||
err = rows.Err()
|
||||
return
|
||||
return eventNIDs, rows.Err()
|
||||
}
|
||||
|
||||
func (s *membershipStatements) updateMembership(
|
||||
|
|
|
|||
|
|
@ -134,8 +134,7 @@ func (s *accountDataStatements) selectAccountDataInRange(
|
|||
data[roomID] = []string{dataType}
|
||||
}
|
||||
}
|
||||
err = rows.Err()
|
||||
return
|
||||
return data, rows.Err()
|
||||
}
|
||||
|
||||
func (s *accountDataStatements) selectMaxAccountDataID(
|
||||
|
|
|
|||
Loading…
Reference in a new issue