From: Giteabot <teabot@gitea.io>
Date: Sun, 17 Mar 2024 13:51:15 +0000 (+0800)
Subject: Fix user id column case (#29863) (#29867)
X-Git-Tag: v1.21.9~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c044510ca8bed67cb2d50ba741b3d0b520aa3c43;p=gitea.git

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 <nanguanlin6@gmail.com>
---

diff --git a/models/user/email_address.go b/models/user/email_address.go
index f1ed6692cf..226e0ae5a3 100644
--- a/models/user/email_address.go
+++ b/models/user/email_address.go
@@ -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).