mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
Claude
44323373e3
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
108 lines
2.7 KiB
Go
108 lines
2.7 KiB
Go
// Code generated by sqlc. DO NOT EDIT.
|
|
// versions:
|
|
// sqlc v1.30.0
|
|
// source: blocks.sql
|
|
|
|
package dbgen
|
|
|
|
import (
|
|
"context"
|
|
)
|
|
|
|
const blockUser = `-- name: BlockUser :exec
|
|
INSERT OR IGNORE INTO user_blocks (blocker_id, blocked_id) VALUES (?, ?)
|
|
`
|
|
|
|
type BlockUserParams struct {
|
|
BlockerID int64 `json:"blockerId"`
|
|
BlockedID int64 `json:"blockedId"`
|
|
}
|
|
|
|
func (q *Queries) BlockUser(ctx context.Context, arg BlockUserParams) error {
|
|
_, err := q.db.ExecContext(ctx, blockUser, arg.BlockerID, arg.BlockedID)
|
|
return err
|
|
}
|
|
|
|
const isBlocked = `-- name: IsBlocked :one
|
|
SELECT 1 FROM user_blocks WHERE blocker_id = ? AND blocked_id = ? LIMIT 1
|
|
`
|
|
|
|
type IsBlockedParams struct {
|
|
BlockerID int64 `json:"blockerId"`
|
|
BlockedID int64 `json:"blockedId"`
|
|
}
|
|
|
|
func (q *Queries) IsBlocked(ctx context.Context, arg IsBlockedParams) (int64, error) {
|
|
row := q.db.QueryRowContext(ctx, isBlocked, arg.BlockerID, arg.BlockedID)
|
|
var column_1 int64
|
|
err := row.Scan(&column_1)
|
|
return column_1, err
|
|
}
|
|
|
|
const isEitherBlocked = `-- name: IsEitherBlocked :one
|
|
SELECT 1 FROM user_blocks
|
|
WHERE (blocker_id = ? AND blocked_id = ?)
|
|
OR (blocker_id = ? AND blocked_id = ?)
|
|
LIMIT 1
|
|
`
|
|
|
|
type IsEitherBlockedParams struct {
|
|
BlockerID int64 `json:"blockerId"`
|
|
BlockedID int64 `json:"blockedId"`
|
|
BlockerID_2 int64 `json:"blockerId2"`
|
|
BlockedID_2 int64 `json:"blockedId2"`
|
|
}
|
|
|
|
func (q *Queries) IsEitherBlocked(ctx context.Context, arg IsEitherBlockedParams) (int64, error) {
|
|
row := q.db.QueryRowContext(ctx, isEitherBlocked,
|
|
arg.BlockerID,
|
|
arg.BlockedID,
|
|
arg.BlockerID_2,
|
|
arg.BlockedID_2,
|
|
)
|
|
var column_1 int64
|
|
err := row.Scan(&column_1)
|
|
return column_1, err
|
|
}
|
|
|
|
const listBlockedUsers = `-- name: ListBlockedUsers :many
|
|
SELECT blocked_id FROM user_blocks WHERE blocker_id = ? ORDER BY created_at DESC
|
|
`
|
|
|
|
func (q *Queries) ListBlockedUsers(ctx context.Context, blockerID int64) ([]int64, error) {
|
|
rows, err := q.db.QueryContext(ctx, listBlockedUsers, blockerID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
items := []int64{}
|
|
for rows.Next() {
|
|
var blocked_id int64
|
|
if err := rows.Scan(&blocked_id); err != nil {
|
|
return nil, err
|
|
}
|
|
items = append(items, blocked_id)
|
|
}
|
|
if err := rows.Close(); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
return items, nil
|
|
}
|
|
|
|
const unblockUser = `-- name: UnblockUser :exec
|
|
DELETE FROM user_blocks WHERE blocker_id = ? AND blocked_id = ?
|
|
`
|
|
|
|
type UnblockUserParams struct {
|
|
BlockerID int64 `json:"blockerId"`
|
|
BlockedID int64 `json:"blockedId"`
|
|
}
|
|
|
|
func (q *Queries) UnblockUser(ctx context.Context, arg UnblockUserParams) error {
|
|
_, err := q.db.ExecContext(ctx, unblockUser, arg.BlockerID, arg.BlockedID)
|
|
return err
|
|
}
|