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