mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
Wire the sqlc-generated dbgen package into db.DB so it stops being dead
code (audit A-2026-07-05) and becomes the real, CI-verified query layer.
db.DB now holds a *dbgen.Queries (initialized in Open via dbgen.New).
Query method bodies delegate to it; sqlc owns the SQL text and parameter
binding (make sqlc-verify), while db keeps its stable public API and
domain model types so no caller in api/admin/ws/service changes. The
migration is incremental — a method either delegates to d.q.* or still
runs raw SQL — so both layers are correct during the transition.
Converted domains (now load-bearing through sqlc):
- blocks: BlockUser, UnblockUser, IsBlocked, IsEitherBlocked,
ListBlockedUsers (added the query to blocks.sql + regenerated).
Empty ListBlockedUsers now returns []int64{} instead of nil, matching
the MemStore backend — a latent inconsistency fixed, not a regression.
- lockouts: UpsertLockout, LoadActiveLockouts, CleanupExpiredLockouts,
DeleteLockout (RFC3339 time formatting/parsing kept in the wrappers).
- roles: GetRoleByID, ListRoles, GetRoleForUser via a shared roleFromGen
mapper (int64 position/is_default -> int/bool). GetUserWithRole stays
raw for now.
Remaining domains stay on raw SQL and are tracked in
docs/plans/sqlc-adoption.md; store/ event+plugin SQL is intentionally
excluded (that layer is removed in D3). Decisions doc + audit closure
updated (A-2026-07-05 -> in progress).
Verified: go build ./...; go test -race ./db ./service ./auth ./ws (api
green non-race, race run matches CI's -timeout 20m); make sqlc-verify and
protocol-verify pass with the regenerated output committed.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UA17KPvqGBX3XbXYnMf1rA
151 lines
5.2 KiB
Go
151 lines
5.2 KiB
Go
// Package db provides database access for the OwnCord server.
|
|
// It uses modernc.org/sqlite — a pure-Go SQLite driver requiring no CGO.
|
|
package db
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"github.com/owncord/server/db/dbgen"
|
|
"github.com/owncord/server/migrations"
|
|
_ "modernc.org/sqlite" // register the sqlite3 driver
|
|
)
|
|
|
|
// DB wraps *sql.DB and exposes the subset of methods needed by the server.
|
|
//
|
|
// q is the sqlc-generated query layer (db/dbgen). Query method bodies delegate
|
|
// to it — sqlc is the source of truth for the SQL text and parameter binding
|
|
// (verified in CI by `make sqlc-verify`), while this package keeps the stable
|
|
// public API and the domain model types the rest of the server consumes.
|
|
// Migration is incremental (decision D2); methods not yet delegated still run
|
|
// their raw SQL directly against sqlDB.
|
|
type DB struct {
|
|
sqlDB *sql.DB
|
|
q *dbgen.Queries
|
|
}
|
|
|
|
// dbCtx is the context used for delegated dbgen calls. The public db.DB API is
|
|
// context-free today; callers that need cancellation use the *Context helpers
|
|
// directly. Using Background here preserves the existing behavior exactly.
|
|
func dbCtx() context.Context { return context.Background() }
|
|
|
|
// Open opens (or creates) a SQLite database at path, enables WAL mode and
|
|
// foreign key enforcement, and returns a ready-to-use DB.
|
|
func Open(path string) (*DB, error) {
|
|
sqlDB, err := sql.Open("sqlite", path)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("opening sqlite db: %w", err)
|
|
}
|
|
|
|
// Verify the connection is actually usable.
|
|
if err := sqlDB.Ping(); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("pinging sqlite db: %w", err)
|
|
}
|
|
|
|
// SQLite only allows one writer at a time. Pin to a single connection
|
|
// so concurrent goroutines queue on the Go side rather than getting
|
|
// SQLITE_BUSY. For :memory: databases this also ensures all callers
|
|
// share the same in-memory state.
|
|
sqlDB.SetMaxOpenConns(1)
|
|
|
|
// Enable WAL mode for better concurrent read performance.
|
|
if _, err := sqlDB.Exec("PRAGMA journal_mode=WAL;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("enabling WAL mode: %w", err)
|
|
}
|
|
|
|
// Wait up to 5 seconds for the write lock instead of failing instantly.
|
|
if _, err := sqlDB.Exec("PRAGMA busy_timeout=5000;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("setting busy_timeout: %w", err)
|
|
}
|
|
|
|
// Enforce foreign key constraints.
|
|
if _, err := sqlDB.Exec("PRAGMA foreign_keys=ON;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("enabling foreign keys: %w", err)
|
|
}
|
|
|
|
// Performance tuning (safe with WAL mode).
|
|
if _, err := sqlDB.Exec("PRAGMA synchronous=NORMAL;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("setting synchronous mode: %w", err)
|
|
}
|
|
if _, err := sqlDB.Exec("PRAGMA temp_store=MEMORY;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("setting temp_store: %w", err)
|
|
}
|
|
if _, err := sqlDB.Exec("PRAGMA mmap_size=268435456;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("setting mmap_size: %w", err)
|
|
}
|
|
if _, err := sqlDB.Exec("PRAGMA cache_size=-64000;"); err != nil {
|
|
_ = sqlDB.Close()
|
|
return nil, fmt.Errorf("setting cache_size: %w", err)
|
|
}
|
|
|
|
return &DB{sqlDB: sqlDB, q: dbgen.New(sqlDB)}, nil
|
|
}
|
|
|
|
// Migrate runs all SQL migration files from the embedded migrations FS in
|
|
// lexicographic order, applying each file exactly once. It delegates to
|
|
// MigrateFS (defined in migrate.go) which maintains the schema_versions
|
|
// tracking table.
|
|
func Migrate(database *DB) error {
|
|
return MigrateFS(database, migrations.FS)
|
|
}
|
|
|
|
// Close releases the underlying database connection.
|
|
func (d *DB) Close() error {
|
|
// Run PRAGMA optimize to analyze and update query planner statistics.
|
|
_, _ = d.sqlDB.Exec("PRAGMA optimize;")
|
|
return d.sqlDB.Close()
|
|
}
|
|
|
|
// QueryRow executes a query that returns at most one row.
|
|
func (d *DB) QueryRow(query string, args ...any) *sql.Row {
|
|
return d.sqlDB.QueryRow(query, args...)
|
|
}
|
|
|
|
// QueryRowContext executes a query that returns at most one row, with context.
|
|
func (d *DB) QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row {
|
|
return d.sqlDB.QueryRowContext(ctx, query, args...)
|
|
}
|
|
|
|
// Exec executes a query that doesn't return rows.
|
|
func (d *DB) Exec(query string, args ...any) (sql.Result, error) {
|
|
return d.sqlDB.Exec(query, args...)
|
|
}
|
|
|
|
// ExecContext executes a query that doesn't return rows, with context.
|
|
func (d *DB) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) {
|
|
return d.sqlDB.ExecContext(ctx, query, args...)
|
|
}
|
|
|
|
// Query executes a query that returns multiple rows.
|
|
func (d *DB) Query(query string, args ...any) (*sql.Rows, error) {
|
|
return d.sqlDB.Query(query, args...)
|
|
}
|
|
|
|
// QueryContext executes a query that returns multiple rows, with context.
|
|
func (d *DB) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) {
|
|
return d.sqlDB.QueryContext(ctx, query, args...)
|
|
}
|
|
|
|
// Begin starts a database transaction.
|
|
func (d *DB) Begin() (*sql.Tx, error) {
|
|
return d.sqlDB.Begin()
|
|
}
|
|
|
|
// BeginTx starts a database transaction with context and options.
|
|
func (d *DB) BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, error) {
|
|
return d.sqlDB.BeginTx(ctx, opts)
|
|
}
|
|
|
|
// SQLDb returns the underlying *sql.DB for cases requiring direct access.
|
|
func (d *DB) SQLDb() *sql.DB {
|
|
return d.sqlDB
|
|
}
|