Skip to content

Commit c044510

Browse files
GiteaBotlng2020
andauthored
Fix user id column case (#29863) (#29867)
Backport #29863 by @lng2020 Sometimes the column name is case-sensitive and it may cause 500. Co-authored-by: Nanguan Lin <[email protected]>
1 parent 85f31eb commit c044510

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

models/user/email_address.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail
491491
cond = cond.And(builder.Eq{"email_address.is_activated": false})
492492
}
493493

494-
count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.ID = email_address.uid").
494+
count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.id = email_address.uid").
495495
Where(cond).Count(new(EmailAddress))
496496
if err != nil {
497497
return nil, 0, fmt.Errorf("Count: %w", err)
@@ -507,7 +507,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail
507507
emails := make([]*SearchEmailResult, 0, opts.PageSize)
508508
err = db.GetEngine(ctx).Table("email_address").
509509
Select("email_address.*, `user`.name, `user`.full_name").
510-
Join("INNER", "`user`", "`user`.ID = email_address.uid").
510+
Join("INNER", "`user`", "`user`.id = email_address.uid").
511511
Where(cond).
512512
OrderBy(orderby).
513513
Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).

0 commit comments

Comments
 (0)