Skip to content

Commit

Permalink
Merge branch 'root-v1.21-and-main' into release/dcs/v1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
richmahn committed Jul 11, 2024
2 parents 60b82ad + f85977a commit 104755c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions models/catalog_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ func SearchDoor43MetadataFieldByCondition(ctx context.Context, opts *door43metad
}

sess := db.GetEngine(db.DefaultContext).Table("door43_metadata").
Distinct("`door43_metadata`."+field).
Distinct(field).
Join("INNER", "repository", "`repository`.id = `door43_metadata`.repo_id").
Join("INNER", "user", "`repository`.owner_id = `user`.id").
Where(cond).
And(builder.Neq{"`door43_metadata`." + field: ""}).
And(builder.Neq{field: ""}).
OrderBy(field)

err := sess.Find(&results)
Expand Down

0 comments on commit 104755c

Please sign in to comment.