From 1909074898e7348c51ae599394bd2a5a0baafafc Mon Sep 17 00:00:00 2001 From: richjohnrambo Date: Tue, 22 Sep 2026 20:26:43 +0800 Subject: [PATCH] fix tenant friend request row scans --- server/db/mysql/tenant_adapter.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/server/db/mysql/tenant_adapter.go b/server/db/mysql/tenant_adapter.go index e2936a4..fb15bba 100644 --- a/server/db/mysql/tenant_adapter.go +++ b/server/db/mysql/tenant_adapter.go @@ -6445,9 +6445,10 @@ func (a *adapter) TenantFriendRequestList(id t.TenantID, uid t.Uid, direction, s for rows.Next() { row := struct { ID int64 - RequestID string `db:"request_id"` - ApplicantID int64 `db:"applicant_id"` - TargetID int64 `db:"target_id"` + TenantID t.TenantID `db:"tenant_id"` + RequestID string `db:"request_id"` + ApplicantID int64 `db:"applicant_id"` + TargetID int64 `db:"target_id"` Message string Source string SourceTopic string `db:"source_topic"` @@ -6589,9 +6590,10 @@ func (a *adapter) TenantFriendRequestAccept(id t.TenantID, requestID string, act }() row := struct { ID int64 - RequestID string `db:"request_id"` - ApplicantID int64 `db:"applicant_id"` - TargetID int64 `db:"target_id"` + TenantID t.TenantID `db:"tenant_id"` + RequestID string `db:"request_id"` + ApplicantID int64 `db:"applicant_id"` + TargetID int64 `db:"target_id"` Message string Source string SourceTopic string `db:"source_topic"` @@ -7329,9 +7331,10 @@ func (a *adapter) friendRequestByIdempotency(ctx context.Context, tenantID t.Ten func (a *adapter) friendRequestByQuery(ctx context.Context, tenantID t.TenantID, query string, args ...any) (*t.FriendRequest, error) { row := struct { ID int64 - RequestID string `db:"request_id"` - ApplicantID int64 `db:"applicant_id"` - TargetID int64 `db:"target_id"` + TenantID t.TenantID `db:"tenant_id"` + RequestID string `db:"request_id"` + ApplicantID int64 `db:"applicant_id"` + TargetID int64 `db:"target_id"` Message string Source string SourceTopic string `db:"source_topic"`