Skip to content

Commit 34df9de

Browse files
dubeglunny
authored andcommitted
Convert xorm literal queries to method calls (gogs#2253)
1 parent fa8d40f commit 34df9de

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

models/migrations/migrations.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,7 @@ func convertDateToUnix(x *xorm.Engine) (err error) {
712712
offset := 0
713713
for {
714714
beans := make([]*Bean, 0, 100)
715-
if err = x.SQL(fmt.Sprintf("SELECT * FROM `%s` ORDER BY id ASC LIMIT 100 OFFSET %d",
716-
table.name, offset)).Find(&beans); err != nil {
715+
if err = x.Table(table.name).Asc("id").Limit(100, offset).Find(&beans); err != nil {
717716
return fmt.Errorf("select beans [table: %s, offset: %d]: %v", table.name, offset, err)
718717
}
719718
log.Trace("Table [%s]: offset: %d, beans: %d", table.name, offset, len(beans))

models/migrations/v28.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func addRepoSize(x *xorm.Engine) (err error) {
3737
offset := 0
3838
for {
3939
repos := make([]*Repository, 0, 10)
40-
if err = x.Sql(fmt.Sprintf("SELECT * FROM `repository` ORDER BY id ASC LIMIT 10 OFFSET %d", offset)).
41-
Find(&repos); err != nil {
40+
if err = x.Table("repository").Asc("id").Limit(10, offset).Find(&repos); err != nil {
4241
return fmt.Errorf("select repos [offset: %d]: %v", offset, err)
4342
}
4443
log.Trace("Select [offset: %d, repos: %d]", offset, len(repos))

0 commit comments

Comments
 (0)