Skip to content

Commit

Permalink
fix migrate failed and org dashboard failed on MSSQL database (#1448)
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny authored Apr 7, 2017
1 parent cf6699f commit 5acfc7c
Show file tree
Hide file tree
Showing 36 changed files with 1,993 additions and 1,628 deletions.
25 changes: 21 additions & 4 deletions models/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -670,13 +670,30 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*Repository, error)
Find(&repos)
}

func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
repos := make([]*Repository, 0, 10)
return repos, x.
Select("`repository`.*").
func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
repoIDs := make([]int64, 0, 10)
return repoIDs, x.
Table("repository").
Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id AND `repository`.is_mirror=?", true).
Where(env.cond()).
GroupBy("`repository`.id").
OrderBy("updated_unix DESC").
Cols("`repository`.id").
Find(&repoIDs)
}

func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
repoIDs, err := env.MirrorRepoIDs()
if err != nil {
return nil, fmt.Errorf("MirrorRepoIDs: %v", err)
}

repos := make([]*Repository, 0, len(repoIDs))
if len(repoIDs) <= 0 {
return repos, nil
}

return repos, x.
In("`repository`.id", repoIDs).
Find(&repos)
}
33 changes: 22 additions & 11 deletions vendor/github.com/go-xorm/xorm/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 21 additions & 8 deletions vendor/github.com/go-xorm/xorm/README_CN.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/github.com/go-xorm/xorm/VERSION

This file was deleted.

37 changes: 37 additions & 0 deletions vendor/github.com/go-xorm/xorm/convert.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5acfc7c

Please sign in to comment.