aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/dbx/users.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbx/users.go')
-rw-r--r--src/dbx/users.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/dbx/users.go b/src/dbx/users.go
index e2270db..bf78dcd 100644
--- a/src/dbx/users.go
+++ b/src/dbx/users.go
@@ -1,6 +1,7 @@
package dbx
import (
+ "context"
"database/sql"
"errors"
@@ -27,7 +28,7 @@ func CreateUser(user User) error {
return err
}
- _, err = db.Exec(`
+ _, err = db.ExecContext(context.TODO(), `
INSERT INTO users (
email,
username,
@@ -43,14 +44,14 @@ func Login(username, password string) (User, error) {
username = norm.NFC.String(username)
password = norm.NFC.String(password)
- /* TODO: Pass a context here? */
- rs, err := db.Query(`SELECT * FROM users WHERE username = ?`, username)
+ rs, err := db.QueryxContext(context.TODO(),
+ `SELECT * FROM users WHERE username = ?`, username)
if err != nil {
return User{}, err
}
- u, err := scanToStruct[User](rs)
- switch {
+ var u User
+ switch err = rs.Scan(&u); {
case errors.Is(err, sql.ErrNoRows):
return User{}, LoginFailed
case err != nil: