Override named result parameters in last returns

Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
This commit is contained in:
Kiril Vladimiroff 2020-01-17 11:43:50 +02:00
parent 59465746bc
commit 7abd114aa4
No known key found for this signature in database
GPG key ID: E8AC87A89B24A670
5 changed files with 7 additions and 12 deletions

View file

@ -115,8 +115,7 @@ func (s *accountDataStatements) selectAccountData(
global = append(global, ac) global = append(global, ac)
} }
} }
err = rows.Err() return global, rooms, rows.Err()
return
} }
func (s *accountDataStatements) selectAccountDataByType( func (s *accountDataStatements) selectAccountDataByType(

View file

@ -127,6 +127,5 @@ func (s *membershipStatements) selectMembershipsByLocalpart(
} }
memberships = append(memberships, m) memberships = append(memberships, m)
} }
err = rows.Err() return memberships, rows.Err()
return
} }

View file

@ -111,8 +111,7 @@ func (s *threepidStatements) selectThreePIDsForLocalpart(
Medium: medium, Medium: medium,
}) })
} }
err = rows.Err() return threepids, rows.Err()
return
} }
func (s *threepidStatements) insertThreePID( func (s *threepidStatements) insertThreePID(

View file

@ -160,9 +160,9 @@ func (s *membershipStatements) selectMembershipsFromRoom(
} }
eventNIDs = append(eventNIDs, eNID) eventNIDs = append(eventNIDs, eNID)
} }
err = rows.Err() return eventNIDs, rows.Err()
return
} }
func (s *membershipStatements) selectMembershipsFromRoomAndMembership( func (s *membershipStatements) selectMembershipsFromRoomAndMembership(
ctx context.Context, ctx context.Context,
roomNID types.RoomNID, membership membershipState, roomNID types.RoomNID, membership membershipState,
@ -181,8 +181,7 @@ func (s *membershipStatements) selectMembershipsFromRoomAndMembership(
} }
eventNIDs = append(eventNIDs, eNID) eventNIDs = append(eventNIDs, eNID)
} }
err = rows.Err() return eventNIDs, rows.Err()
return
} }
func (s *membershipStatements) updateMembership( func (s *membershipStatements) updateMembership(

View file

@ -134,8 +134,7 @@ func (s *accountDataStatements) selectAccountDataInRange(
data[roomID] = []string{dataType} data[roomID] = []string{dataType}
} }
} }
err = rows.Err() return data, rows.Err()
return
} }
func (s *accountDataStatements) selectMaxAccountDataID( func (s *accountDataStatements) selectMaxAccountDataID(