coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert xorm literal queries to method calls (#2253)

This commit is contained in:
G 2017-08-04 00:42:51 -04:00 committed by Lunny Xiao
parent fa8d40faca
commit 34df9deff1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
models/migrations/migrations.go
View File

@ -712,8 +712,7 @@ func convertDateToUnix(x *xorm.Engine) (err error) {
offset := 0 offset := 0
for { for {
beans := make([]*Bean, 0, 100) beans := make([]*Bean, 0, 100)
if err = x.SQL(fmt.Sprintf("SELECT * FROM `%s` ORDER BY id ASC LIMIT 100 OFFSET %d", if err = x.Table(table.name).Asc("id").Limit(100, offset).Find(&beans); err != nil {
table.name, offset)).Find(&beans); err != nil {
return fmt.Errorf("select beans [table: %s, offset: %d]: %v", table.name, offset, err) return fmt.Errorf("select beans [table: %s, offset: %d]: %v", table.name, offset, err)
} }
log.Trace("Table [%s]: offset: %d, beans: %d", table.name, offset, len(beans)) log.Trace("Table [%s]: offset: %d, beans: %d", table.name, offset, len(beans))

3
models/migrations/v28.go
View File

@ -37,8 +37,7 @@ func addRepoSize(x *xorm.Engine) (err error) {
offset := 0 offset := 0
for { for {
repos := make([]*Repository, 0, 10) repos := make([]*Repository, 0, 10)
if err = x.Sql(fmt.Sprintf("SELECT * FROM `repository` ORDER BY id ASC LIMIT 10 OFFSET %d", offset)). if err = x.Table("repository").Asc("id").Limit(10, offset).Find(&repos); err != nil {
Find(&repos); err != nil {
return fmt.Errorf("select repos [offset: %d]: %v", offset, err) return fmt.Errorf("select repos [offset: %d]: %v", offset, err)
} }
log.Trace("Select [offset: %d, repos: %d]", offset, len(repos)) log.Trace("Select [offset: %d, repos: %d]", offset, len(repos))