From 9302eba971611601c3ebf6024e22a11c63f4e151 Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 23 Sep 2021 16:45:36 +0100 Subject: DBContext is just a Context (#17100) * DBContext is just a Context This PR removes some of the specialness from the DBContext and makes it context This allows us to simplify the GetEngine code to wrap around any context in future and means that we can change our loadRepo(e Engine) functions to simply take contexts. Signed-off-by: Andrew Thornton * fix unit tests Signed-off-by: Andrew Thornton * another place that needs to set the initial context Signed-off-by: Andrew Thornton * avoid race Signed-off-by: Andrew Thornton * change attachment error Signed-off-by: Andrew Thornton --- models/repo_activity.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'models/repo_activity.go') diff --git a/models/repo_activity.go b/models/repo_activity.go index cfbda21411..5986da7e77 100644 --- a/models/repo_activity.go +++ b/models/repo_activity.go @@ -246,7 +246,7 @@ func (stats *ActivityStats) FillPullRequests(repoID int64, fromTime time.Time) e } func pullRequestsForActivityStatement(repoID int64, fromTime time.Time, merged bool) *xorm.Session { - sess := db.DefaultContext().Engine().Where("pull_request.base_repo_id=?", repoID). + sess := db.GetEngine(db.DefaultContext).Where("pull_request.base_repo_id=?", repoID). Join("INNER", "issue", "pull_request.issue_id = issue.id") if merged { @@ -314,7 +314,7 @@ func (stats *ActivityStats) FillUnresolvedIssues(repoID int64, fromTime time.Tim } func issuesForActivityStatement(repoID int64, fromTime time.Time, closed, unresolved bool) *xorm.Session { - sess := db.DefaultContext().Engine().Where("issue.repo_id = ?", repoID). + sess := db.GetEngine(db.DefaultContext).Where("issue.repo_id = ?", repoID). And("issue.is_closed = ?", closed) if !unresolved { @@ -356,7 +356,7 @@ func (stats *ActivityStats) FillReleases(repoID int64, fromTime time.Time) error } func releasesForActivityStatement(repoID int64, fromTime time.Time) *xorm.Session { - return db.DefaultContext().Engine().Where("release.repo_id = ?", repoID). + return db.GetEngine(db.DefaultContext).Where("release.repo_id = ?", repoID). And("release.is_draft = ?", false). And("release.created_unix >= ?", fromTime.Unix()) } -- cgit v1.2.3