loading up the forgejo repo on tangled to test page performance
Fix user id column case (#29863)
Sometimes the column name is case-sensitive and it may cause 500.
(cherry picked from commit df05c558da704f0c9c9f11d32bba2a9c1cb2f8a8)
authored by
Nanguan Lin
and committed by
Earl Warren
32380ffa
003d860a
+2
-2
+2
-2
models/user/email_address.go
+2
-2
models/user/email_address.go
···
443
443
cond = cond.And(builder.Eq{"email_address.is_activated": opts.IsActivated.Value()})
444
444
}
445
445
446
-
count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.ID = email_address.uid").
446
+
count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.id = email_address.uid").
447
447
Where(cond).Count(new(EmailAddress))
448
448
if err != nil {
449
449
return nil, 0, fmt.Errorf("Count: %w", err)
···
459
459
emails := make([]*SearchEmailResult, 0, opts.PageSize)
460
460
err = db.GetEngine(ctx).Table("email_address").
461
461
Select("email_address.*, `user`.name, `user`.full_name").
462
-
Join("INNER", "`user`", "`user`.ID = email_address.uid").
462
+
Join("INNER", "`user`", "`user`.id = email_address.uid").
463
463
Where(cond).
464
464
OrderBy(orderby).
465
465
Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).