williamp/scannerbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: use postgres instead of scylla, easier to host

Browse Source
This commit is contained in:
William Peebles
2026-05-15 02:20:53 +00:00
parent c1c8a3d6aa
commit 26b00f8566
7 changed files with 106 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/db.go
+24 -26
View File
@@ -1,24 +1,22 @@
package api
import (
"context"
"errors"
"fmt"
"log/slog"
"git.dubyatp.xyz/dubyatp/scannerbot/server/db"
"github.com/gocql/gocql"
"github.com/jackc/pgx/v5"
)
func dbGetUser(id string) (*User, error) {
query := `SELECT id, name, password FROM users WHERE id = ?`
query := `SELECT id, name, password FROM users WHERE id = $1`
var user User
var gid gocql.UUID
err := db.Session.Query(query, id).Scan(&gid, &user.Name, &user.Password)
user.ID = [16]byte(gid)
if err == gocql.ErrNotFound {
err := db.Pool.QueryRow(context.Background(), query, id).Scan(&user.ID, &user.Name, &user.Password)
if errors.Is(err, pgx.ErrNoRows) {
slog.Debug("db: user not found", "userid", id)
return nil, errors.New("User not found")
return nil, errors.New("user not found")
} else if err != nil {
slog.Error("db: failed to query user", "error", err)
return nil, fmt.Errorf("failed to query user")
@@ -29,15 +27,12 @@ func dbGetUser(id string) (*User, error) {
}
func dbGetUserByName(username string) (*User, error) {
query := `SELECT id, name, password FROM users WHERE name = ?`
query := `SELECT id, name, password FROM users WHERE name = $1`
var user User
var gid gocql.UUID
err := db.Session.Query(query, username).Scan(&gid, &user.Name, &user.Password)
user.ID = [16]byte(gid)
if err == gocql.ErrNotFound {
err := db.Pool.QueryRow(context.Background(), query, username).Scan(&user.ID, &user.Name, &user.Password)
if errors.Is(err, pgx.ErrNoRows) {
slog.Debug("db: user not found", "username", username)
return nil, errors.New("User not found")
return nil, errors.New("user not found")
} else if err != nil {
slog.Error("db: failed to query user", "error", err)
return nil, fmt.Errorf("failed to query user")
@@ -49,21 +44,24 @@ func dbGetUserByName(username string) (*User, error) {
func dbGetAllUsers() ([]*User, error) {
query := `SELECT id, name, password FROM users`
iter := db.Session.Query(query).Iter()
defer iter.Close()
rows, err := db.Pool.Query(context.Background(), query)
if err != nil {
slog.Error("db: failed to query users", "error", err)
return nil, fmt.Errorf("failed to query users")
}
defer rows.Close()
var users []*User
for {
for rows.Next() {
user := &User{}
var gid gocql.UUID
if !iter.Scan(&gid, &user.Name, &user.Password) {
break
if err := rows.Scan(&user.ID, &user.Name, &user.Password); err != nil {
slog.Error("db: failed to scan user", "error", err)
return nil, fmt.Errorf("failed to scan user")
}
user.ID = [16]byte(gid)
users = append(users, user)
}
if err := iter.Close(); err != nil {
slog.Error("db: failed to iterate users", "error", err)
if err := rows.Err(); err != nil {
slog.Error("db: row iteration error", "error", err)
return nil, fmt.Errorf("failed to iterate users")
}
if len(users) == 0 {
@@ -76,8 +74,8 @@ func dbGetAllUsers() ([]*User, error) {
}
func dbAddUser(user *User) error {
query := `INSERT INTO users (id, name, password) VALUES (?, ?, ?)`
err := db.Session.Query(query, gocql.UUID(user.ID), user.Name, user.Password).Exec()
query := `INSERT INTO users (id, name, password) VALUES ($1, $2, $3)`
_, err := db.Pool.Exec(context.Background(), query, user.ID, user.Name, user.Password)
if err != nil {
slog.Error("db: failed to add user", "error", err, "userid", user.ID, "username", user.Name)
return fmt.Errorf("failed to add user")