Skip to content

Commit 1170e06

Browse files
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 <[email protected]> Co-authored-by: zeripath <[email protected]>
1 parent 8adc6a1 commit 1170e06

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

models/issues/label.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ func CountOrphanedLabels() (int64, error) {
755755
norepo, err := db.GetEngine(db.DefaultContext).Table("label").
756756
Where(builder.And(
757757
builder.Gt{"repo_id": 0},
758-
builder.NotIn("repo_id", builder.Select("id").From("repository")),
758+
builder.NotIn("repo_id", builder.Select("id").From("`repository`")),
759759
)).
760760
Count()
761761
if err != nil {
@@ -765,7 +765,7 @@ func CountOrphanedLabels() (int64, error) {
765765
noorg, err := db.GetEngine(db.DefaultContext).Table("label").
766766
Where(builder.And(
767767
builder.Gt{"org_id": 0},
768-
builder.NotIn("org_id", builder.Select("id").From("user")),
768+
builder.NotIn("org_id", builder.Select("id").From("`user`")),
769769
)).
770770
Count()
771771
if err != nil {
@@ -786,7 +786,7 @@ func DeleteOrphanedLabels() error {
786786
if _, err := db.GetEngine(db.DefaultContext).
787787
Where(builder.And(
788788
builder.Gt{"repo_id": 0},
789-
builder.NotIn("repo_id", builder.Select("id").From("repository")),
789+
builder.NotIn("repo_id", builder.Select("id").From("`repository`")),
790790
)).
791791
Delete(Label{}); err != nil {
792792
return err
@@ -796,7 +796,7 @@ func DeleteOrphanedLabels() error {
796796
if _, err := db.GetEngine(db.DefaultContext).
797797
Where(builder.And(
798798
builder.Gt{"org_id": 0},
799-
builder.NotIn("org_id", builder.Select("id").From("user")),
799+
builder.NotIn("org_id", builder.Select("id").From("`user`")),
800800
)).
801801
Delete(Label{}); err != nil {
802802
return err

0 commit comments

Comments
 (0)