From 32380ffa579b1b2be619d3a0e8e521947900a645 Mon Sep 17 00:00:00 2001
From: Nanguan Lin <nanguanlin6@gmail.com>
Date: Sun, 17 Mar 2024 21:24:45 +0800
Subject: [PATCH] Fix user id column case (#29863)
Sometimes the column name is case-sensitive and it may cause 500.
(cherry picked from commit df05c558da704f0c9c9f11d32bba2a9c1cb2f8a8)
---
models/user/email_address.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/models/user/email_address.go b/models/user/email_address.go
index f2ee5e61b2..45bcc54aa3 100644
--- a/models/user/email_address.go
+++ b/models/user/email_address.go
@@ -443,7 +443,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)
@@ -459,7 +459,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).