Skip to content

Commit 1cc4a82

Browse files
zeripathyardenshoham
authored andcommitted
Fix DBConsistency checks on MSSQL (go-gitea#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 go-gitea#23064 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 7c3196c commit 1cc4a82

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

models/issues/label.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ func CountOrphanedLabels(ctx context.Context) (int64, error) {
778778
norepo, err := db.GetEngine(ctx).Table("label").
779779
Where(builder.And(
780780
builder.Gt{"repo_id": 0},
781-
builder.NotIn("repo_id", builder.Select("id").From("repository")),
781+
builder.NotIn("repo_id", builder.Select("id").From("`repository`")),
782782
)).
783783
Count()
784784
if err != nil {
@@ -788,7 +788,7 @@ func CountOrphanedLabels(ctx context.Context) (int64, error) {
788788
noorg, err := db.GetEngine(ctx).Table("label").
789789
Where(builder.And(
790790
builder.Gt{"org_id": 0},
791-
builder.NotIn("org_id", builder.Select("id").From("user")),
791+
builder.NotIn("org_id", builder.Select("id").From("`user`")),
792792
)).
793793
Count()
794794
if err != nil {
@@ -809,7 +809,7 @@ func DeleteOrphanedLabels(ctx context.Context) error {
809809
if _, err := db.GetEngine(ctx).
810810
Where(builder.And(
811811
builder.Gt{"repo_id": 0},
812-
builder.NotIn("repo_id", builder.Select("id").From("repository")),
812+
builder.NotIn("repo_id", builder.Select("id").From("`repository`")),
813813
)).
814814
Delete(Label{}); err != nil {
815815
return err
@@ -819,7 +819,7 @@ func DeleteOrphanedLabels(ctx context.Context) error {
819819
if _, err := db.GetEngine(ctx).
820820
Where(builder.And(
821821
builder.Gt{"org_id": 0},
822-
builder.NotIn("org_id", builder.Select("id").From("user")),
822+
builder.NotIn("org_id", builder.Select("id").From("`user`")),
823823
)).
824824
Delete(Label{}); err != nil {
825825
return err

0 commit comments

Comments
 (0)