Browse Source

#13 fix postgres aggregate

tags/v0.9.99
Unknwon 8 years ago
parent
commit
263304b6b7
2 changed files with 6 additions and 7 deletions
  1. 3
    3
      models/repo.go
  2. 3
    4
      models/user.go

+ 3
- 3
models/repo.go View File

if !opts.Private { if !opts.Private {
sess.And("is_private=?", false) sess.And("is_private=?", false)
} }
if len(opts.OrderBy) > 0 {
sess.OrderBy(opts.OrderBy)
}


var countSess xorm.Session var countSess xorm.Session
countSess = *sess countSess = *sess
return nil, 0, fmt.Errorf("Count: %v", err) return nil, 0, fmt.Errorf("Count: %v", err)
} }


if len(opts.OrderBy) > 0 {
sess.OrderBy(opts.OrderBy)
}
return repos, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&repos) return repos, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&repos)
} }



+ 3
- 4
models/user.go View File



users = make([]*User, 0, opts.PageSize) users = make([]*User, 0, opts.PageSize)
// Append conditions // Append conditions
fmt.Println(opts.Type)
sess := x.Where("lower_name like ?", "%"+opts.Keyword+"%").And("type = ?", opts.Type) sess := x.Where("lower_name like ?", "%"+opts.Keyword+"%").And("type = ?", opts.Type)
if len(opts.OrderBy) > 0 {
sess.OrderBy(opts.OrderBy)
}


var countSess xorm.Session var countSess xorm.Session
countSess = *sess countSess = *sess
return nil, 0, fmt.Errorf("Count: %v", err) return nil, 0, fmt.Errorf("Count: %v", err)
} }


if len(opts.OrderBy) > 0 {
sess.OrderBy(opts.OrderBy)
}
return users, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&users) return users, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&users)
} }



Loading…
Cancel
Save