Mercurial > gemma
diff pkg/controllers/user.go @ 486:b2dc9c2f69e0 metamorph-for-all
First stab to use the metamorphic db to do all database stuff.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 24 Aug 2018 13:56:06 +0200 |
| parents | fc37e7072022 |
| children | 8a0737aa6ab6 |
line wrap: on
line diff
--- a/pkg/controllers/user.go Fri Aug 24 12:14:56 2018 +0200 +++ b/pkg/controllers/user.go Fri Aug 24 13:56:06 2018 +0200 @@ -54,7 +54,7 @@ func deleteUser( _ interface{}, req *http.Request, - db *sql.DB, + db *sql.Conn, ) (jr JSONResult, err error) { user := mux.Vars(req)["user"] @@ -71,7 +71,7 @@ var res sql.Result - if res, err = db.Exec(deleteUserSQL, user); err != nil { + if res, err = db.ExecContext(req.Context(), deleteUserSQL, user); err != nil { return } @@ -91,8 +91,9 @@ } func updateUser( - input interface{}, req *http.Request, - db *sql.DB, + input interface{}, + req *http.Request, + db *sql.Conn, ) (jr JSONResult, err error) { user := models.UserName(mux.Vars(req)["user"]) @@ -106,7 +107,8 @@ if s, _ := auth.GetSession(req); s.Roles.Has("sys_admin") { if newUser.Extent == nil { - res, err = db.Exec( + res, err = db.ExecContext( + req.Context(), updateUserSQL, user, newUser.Role, @@ -116,7 +118,8 @@ newUser.Email, ) } else { - res, err = db.Exec( + res, err = db.ExecContext( + req.Context(), updateUserExtentSQL, user, newUser.Role, @@ -133,7 +136,8 @@ err = JSONError{http.StatusBadRequest, "extent is mandatory"} return } - res, err = db.Exec( + res, err = db.ExecContext( + req.Context(), updateUserUnprivSQL, user, newUser.Password, @@ -170,14 +174,16 @@ } func createUser( - input interface{}, req *http.Request, - db *sql.DB, + input interface{}, + req *http.Request, + db *sql.Conn, ) (jr JSONResult, err error) { user := input.(*models.User) if user.Extent == nil { - _, err = db.Exec( + _, err = db.ExecContext( + req.Context(), createUserSQL, user.Role, user.User, @@ -186,7 +192,8 @@ user.Email, ) } else { - _, err = db.Exec( + _, err = db.ExecContext( + req.Context(), createUserExtentSQL, user.Role, user.User, @@ -212,13 +219,14 @@ } func listUsers( - _ interface{}, req *http.Request, - db *sql.DB, + _ interface{}, + req *http.Request, + db *sql.Conn, ) (jr JSONResult, err error) { var rows *sql.Rows - rows, err = db.Query(listUsersSQL) + rows, err = db.QueryContext(req.Context(), listUsersSQL) if err != nil { return } @@ -250,8 +258,9 @@ } func listUser( - _ interface{}, req *http.Request, - db *sql.DB, + _ interface{}, + req *http.Request, + db *sql.Conn, ) (jr JSONResult, err error) { user := models.UserName(mux.Vars(req)["user"]) @@ -265,7 +274,7 @@ Extent: &models.BoundingBox{}, } - err = db.QueryRow(listUserSQL, user).Scan( + err = db.QueryRowContext(req.Context(), listUserSQL, user).Scan( &result.Role, &result.Country, &result.Email,