]> source.dussan.org Git - gitea.git/commitdiff
Fix user id column case (#29863)
authorNanguan Lin <nanguanlin6@gmail.com>
Sun, 17 Mar 2024 13:24:45 +0000 (21:24 +0800)
committerGitHub <noreply@github.com>
Sun, 17 Mar 2024 13:24:45 +0000 (13:24 +0000)
Sometimes the column name is case-sensitive and it may cause 500.

models/user/email_address.go

index a9dbb8e8915ed2c7a848fd479005a0e940ffe202..d26549f383db4a24a25dc1366bd61ad04fb05ffe 100644 (file)
@@ -434,7 +434,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail
                cond = cond.And(builder.Eq{"email_address.is_activated": opts.IsActivated.Value()})
        }
 
-       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)
@@ -450,7 +450,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).