diff options
| author | zeripath | 2023-02-24 21:45:55 +0000 |
|---|---|---|
| committer | GitHub | 2023-02-24 16:45:55 -0500 |
| commit | d827215011260ca704606e421ce9e1eff32387bc (patch) | |
| tree | 8bf299406485a49fd08cda9e9ba730a502a096f5 /models | |
| parent | f4920c9c7f5947d3b6476610f39bc3492ab4ef3b (diff) | |
Fix DBConsistency checks on MSSQL (#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 <art27@cantab.net>
Diffstat (limited to 'models')
| -rw-r--r-- | models/issues/label.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/issues/label.go b/models/issues/label.go index 0dd12fb5c..90e4eb458 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -778,7 +778,7 @@ func CountOrphanedLabels(ctx context.Context) (int64, error) { norepo, err := db.GetEngine(ctx).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 { @@ -788,7 +788,7 @@ func CountOrphanedLabels(ctx context.Context) (int64, error) { noorg, err := db.GetEngine(ctx).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 { @@ -809,7 +809,7 @@ func DeleteOrphanedLabels(ctx context.Context) error { if _, err := db.GetEngine(ctx). 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 @@ -819,7 +819,7 @@ func DeleteOrphanedLabels(ctx context.Context) error { if _, err := db.GetEngine(ctx). 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 |