From 1170e067b25d95621bff04e5b0af3d8d007e527a Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 25 Feb 2023 21:17:14 +0200 Subject: [PATCH] Fix DBConsistency checks on MSSQL (#23132) (#23133) Backport #23132 Unfortunately xorm's `builder.Select(...).From(...)` does not escape the table names. This is mostly not a problem but is a problem with the `user` table. This PR simply escapes the user table. No other uses of `From("user")` where found in the codebase so I think this should be all that is needed. Fix #23064 Signed-off-by: Andrew Thornton Co-authored-by: zeripath --- models/issues/label.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/issues/label.go b/models/issues/label.go index bbdc99e265..2ee66fe9da 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -755,7 +755,7 @@ func CountOrphanedLabels() (int64, error) { norepo, err := db.GetEngine(db.DefaultContext).Table("label"). Where(builder.And( builder.Gt{"repo_id": 0}, - builder.NotIn("repo_id", builder.Select("id").From("repository")), + builder.NotIn("repo_id", builder.Select("id").From("`repository`")), )). Count() if err != nil { @@ -765,7 +765,7 @@ func CountOrphanedLabels() (int64, error) { noorg, err := db.GetEngine(db.DefaultContext).Table("label"). Where(builder.And( builder.Gt{"org_id": 0}, - builder.NotIn("org_id", builder.Select("id").From("user")), + builder.NotIn("org_id", builder.Select("id").From("`user`")), )). Count() if err != nil { @@ -786,7 +786,7 @@ func DeleteOrphanedLabels() error { if _, err := db.GetEngine(db.DefaultContext). Where(builder.And( builder.Gt{"repo_id": 0}, - builder.NotIn("repo_id", builder.Select("id").From("repository")), + builder.NotIn("repo_id", builder.Select("id").From("`repository`")), )). Delete(Label{}); err != nil { return err @@ -796,7 +796,7 @@ func DeleteOrphanedLabels() error { if _, err := db.GetEngine(db.DefaultContext). Where(builder.And( builder.Gt{"org_id": 0}, - builder.NotIn("org_id", builder.Select("id").From("user")), + builder.NotIn("org_id", builder.Select("id").From("`user`")), )). Delete(Label{}); err != nil { return err