]> source.dussan.org Git - gitea.git/commitdiff
Fix user id column case (#29863) (#29867)
authorGiteabot <teabot@gitea.io>
Sun, 17 Mar 2024 13:51:15 +0000 (21:51 +0800)
committerGitHub <noreply@github.com>
Sun, 17 Mar 2024 13:51:15 +0000 (13:51 +0000)
Backport #29863 by @lng2020

Sometimes the column name is case-sensitive and it may cause 500.

Co-authored-by: Nanguan Lin <nanguanlin6@gmail.com>
models/user/email_address.go

index f1ed6692cfefc3bc384b443a7566a3e2d95b8710..226e0ae5a384096611a055c3ef8342e49ec77f55 100644 (file)
@@ -491,7 +491,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail
                cond = cond.And(builder.Eq{"email_address.is_activated": false})
        }
 
-       count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.ID = email_address.uid").
+       count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.id = email_address.uid").
                Where(cond).Count(new(EmailAddress))
        if err != nil {
                return nil, 0, fmt.Errorf("Count: %w", err)
@@ -507,7 +507,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail
        emails := make([]*SearchEmailResult, 0, opts.PageSize)
        err = db.GetEngine(ctx).Table("email_address").
                Select("email_address.*, `user`.name, `user`.full_name").
-               Join("INNER", "`user`", "`user`.ID = email_address.uid").
+               Join("INNER", "`user`", "`user`.id = email_address.uid").
                Where(cond).
                OrderBy(orderby).
                Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).