@@ -628,7 +628,7 @@ func convertDateToUnix(x *xorm.Engine) (err error) { | |||
offset := 0 | |||
for { | |||
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.SQL(fmt.Sprintf("SELECT * FROM `%s` ORDER BY id ASC LIMIT 100 OFFSET %d", | |||
table.name, offset)).Find(&beans); err != nil { | |||
return fmt.Errorf("select beans [table: %s, offset: %d]: %v", table.name, offset, err) | |||
} |
@@ -33,7 +33,7 @@ type Engine interface { | |||
Insert(...interface{}) (int64, error) | |||
InsertOne(interface{}) (int64, error) | |||
Iterate(interface{}, xorm.IterFunc) error | |||
Sql(string, ...interface{}) *xorm.Session | |||
SQL(interface{}, ...interface{}) *xorm.Session | |||
Where(interface{}, ...interface{}) *xorm.Session | |||
} | |||
@@ -494,7 +494,7 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos | |||
} | |||
repos := make([]*Repository, 0, pageSize) | |||
// FIXME: use XORM chain operations instead of raw SQL. | |||
if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository | |||
if err = x.SQL(fmt.Sprintf(`SELECT repository.* FROM repository | |||
INNER JOIN team_repo | |||
ON team_repo.repo_id = repository.id | |||
WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) | |||
@@ -533,7 +533,7 @@ func (org *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error) | |||
} | |||
repos := make([]*Repository, 0, 10) | |||
if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository | |||
if err = x.SQL(fmt.Sprintf(`SELECT repository.* FROM repository | |||
INNER JOIN team_repo | |||
ON team_repo.repo_id = repository.id AND repository.is_mirror = ? | |||
WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) |
@@ -859,7 +859,7 @@ func UserPath(userName string) string { | |||
func GetUserByKeyID(keyID int64) (*User, error) { | |||
user := new(User) | |||
has, err := x.Sql("SELECT a.* FROM `user` AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?", keyID).Get(user) | |||
has, err := x.SQL("SELECT a.* FROM `user` AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?", keyID).Get(user) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { |