Skip to content

Commit 5acfc7c

Browse files
authored
fix migrate failed and org dashboard failed on MSSQL database (#1448)
1 parent cf6699f commit 5acfc7c

36 files changed

+1993
-1628
lines changed

models/org.go

+21-4
Original file line numberDiff line numberDiff line change
@@ -670,13 +670,30 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*Repository, error)
670670
Find(&repos)
671671
}
672672

673-
func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
674-
repos := make([]*Repository, 0, 10)
675-
return repos, x.
676-
Select("`repository`.*").
673+
func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
674+
repoIDs := make([]int64, 0, 10)
675+
return repoIDs, x.
676+
Table("repository").
677677
Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id AND `repository`.is_mirror=?", true).
678678
Where(env.cond()).
679679
GroupBy("`repository`.id").
680680
OrderBy("updated_unix DESC").
681+
Cols("`repository`.id").
682+
Find(&repoIDs)
683+
}
684+
685+
func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
686+
repoIDs, err := env.MirrorRepoIDs()
687+
if err != nil {
688+
return nil, fmt.Errorf("MirrorRepoIDs: %v", err)
689+
}
690+
691+
repos := make([]*Repository, 0, len(repoIDs))
692+
if len(repoIDs) <= 0 {
693+
return repos, nil
694+
}
695+
696+
return repos, x.
697+
In("`repository`.id", repoIDs).
681698
Find(&repos)
682699
}

vendor/github.com/go-xorm/xorm/README.md

+22-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/xorm/README_CN.md

+21-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/xorm/VERSION

-1
This file was deleted.

vendor/github.com/go-xorm/xorm/convert.go

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/xorm/mssql_dialect.go renamed to vendor/github.com/go-xorm/xorm/dialect_mssql.go

+28-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/xorm/mysql_dialect.go renamed to vendor/github.com/go-xorm/xorm/dialect_mysql.go

+92
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)