davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-17 05:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: correct SQL query for active issues

Browse source 
- The `OR` should be inside the `AND` condition to not 'bypass' the other
conditions.
- Added minimal unit test.
- Regression from 2675a24649

(cherry picked from commit 0055fdbdc4)
This commit is contained in:
Gusted 2024-10-21 00:42:15 +02:00 • committed by forgejo-backport-action
parent 240fbc2661
commit d5c6036c53
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
models/activities/repo_activity.go
View file

@ -337,8 +337,7 @@ func newlyCreatedIssues(ctx context.Context, repoID int64, fromTime time.Time) *
func activeIssues(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session {
sess := db.GetEngine(ctx).Where("issue.repo_id = ?", repoID).
And("issue.is_pull = ?", false).
And("issue.created_unix >= ?", fromTime.Unix()).
Or("issue.closed_unix >= ?", fromTime.Unix())
And("issue.created_unix >= ? OR issue.closed_unix >= ?", fromTime.Unix(), fromTime.Unix())
return sess
}