update examples/db to pass golint
Этот коммит содержится в:
родитель
56998cc5cf
коммит
46f5218d36
3 изменённых файлов: 8 добавлений и 7 удалений
|
@ -25,5 +25,5 @@ script:
|
||||||
|
|
||||||
# code correctness
|
# code correctness
|
||||||
- sh -c 'RES="$(go fmt ./...)"; if [ ! -z "$RES" ]; then echo $RES; exit 1; fi'
|
- sh -c 'RES="$(go fmt ./...)"; if [ ! -z "$RES" ]; then echo $RES; exit 1; fi'
|
||||||
- sh -c 'RES="$(golint .)"; if [ ! -z "$RES" ]; then echo $RES; exit 1; fi'
|
- sh -c 'RES="$(golint ./...)"; if [ ! -z "$RES" ]; then echo $RES; exit 1; fi'
|
||||||
- go vet ./...
|
- go vet ./...
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@echo "running all tests"
|
@echo "running all tests"
|
||||||
@sh -c 'if [ ! -z "$(go fmt ./...)" ]; then exit 1; else echo "go fmt OK"; fi'
|
@go fmt ./...
|
||||||
@sh -c 'if [ ! -z "$(golint ./...)" ]; then exit 1; else echo "golint OK"; fi'
|
@golint ./...
|
||||||
go vet ./...
|
go vet ./...
|
||||||
go test
|
go test
|
||||||
go run cmd/godog/main.go -f progress
|
go run cmd/godog/main.go -f progress
|
||||||
|
|
|
@ -13,7 +13,7 @@ type server struct {
|
||||||
db *sql.DB
|
db *sql.DB
|
||||||
}
|
}
|
||||||
|
|
||||||
type User struct {
|
type user struct {
|
||||||
ID int64 `json:"-"`
|
ID int64 `json:"-"`
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Email string `json:"-"`
|
Email string `json:"-"`
|
||||||
|
@ -25,14 +25,15 @@ func (s *server) users(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
users := make([]*User, 0)
|
var users []*user
|
||||||
rows, err := s.db.Query("SELECT id, email, username FROM users")
|
rows, err := s.db.Query("SELECT id, email, username FROM users")
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
switch err {
|
switch err {
|
||||||
case sql.ErrNoRows:
|
case sql.ErrNoRows:
|
||||||
|
users = make([]*user, 0) // an empty array in this case
|
||||||
case nil:
|
case nil:
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
user := &User{}
|
user := &user{}
|
||||||
if err := rows.Scan(&user.ID, &user.Email, &user.Username); err != nil {
|
if err := rows.Scan(&user.ID, &user.Email, &user.Username); err != nil {
|
||||||
fail(w, fmt.Sprintf("failed to scan an user: %s", err), http.StatusInternalServerError)
|
fail(w, fmt.Sprintf("failed to scan an user: %s", err), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
|
@ -45,7 +46,7 @@ func (s *server) users(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
data := struct {
|
data := struct {
|
||||||
Users []*User `json:"users"`
|
Users []*user `json:"users"`
|
||||||
}{Users: users}
|
}{Users: users}
|
||||||
|
|
||||||
ok(w, data)
|
ok(w, data)
|
||||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче