diff --git a/go.mod b/go.mod index 334e121..6e94ffb 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,13 @@ module git.kanopo.dev/rhythm/rhythm-backend go 1.26.2 -require github.com/joho/godotenv v1.5.1 +require ( + github.com/jackc/pgx/v5 v5.9.2 + github.com/joho/godotenv v1.5.1 +) + +require ( + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + golang.org/x/text v0.29.0 // indirect +) diff --git a/go.sum b/go.sum index d61b19e..9ea2463 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,28 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw= +github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/db/users/db.go b/internal/db/users/db.go new file mode 100644 index 0000000..4ba7c7e --- /dev/null +++ b/internal/db/users/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package usersdb + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/db/users/models.go b/internal/db/users/models.go new file mode 100644 index 0000000..4b9fa2c --- /dev/null +++ b/internal/db/users/models.go @@ -0,0 +1,17 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package usersdb + +import ( + "github.com/jackc/pgx/v5/pgtype" +) + +type User struct { + ID pgtype.UUID + Email string + Password string + CreatedAt pgtype.Timestamptz + UpdatedAt pgtype.Timestamptz +} diff --git a/internal/db/users/querier.go b/internal/db/users/querier.go new file mode 100644 index 0000000..4a971de --- /dev/null +++ b/internal/db/users/querier.go @@ -0,0 +1,19 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 + +package usersdb + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +type Querier interface { + CreateUser(ctx context.Context, arg CreateUserParams) (User, error) + DeleteUser(ctx context.Context, id pgtype.UUID) error + GetUser(ctx context.Context, id pgtype.UUID) (User, error) +} + +var _ Querier = (*Queries)(nil) diff --git a/internal/db/users/queries.sql b/internal/db/users/queries.sql new file mode 100644 index 0000000..d14c089 --- /dev/null +++ b/internal/db/users/queries.sql @@ -0,0 +1,15 @@ +-- name: GetUser :one +select * from users +where id = $1 limit 1; + +-- name: CreateUser :one +insert into users ( + email, password +) values ( + $1, $2 +) +returning *; + +-- name: DeleteUser :exec +DELETE FROM users +WHERE id = $1; diff --git a/internal/db/users/queries.sql.go b/internal/db/users/queries.sql.go new file mode 100644 index 0000000..e367366 --- /dev/null +++ b/internal/db/users/queries.sql.go @@ -0,0 +1,67 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.30.0 +// source: queries.sql + +package usersdb + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const createUser = `-- name: CreateUser :one +insert into users ( + email, password +) values ( + $1, $2 +) +returning id, email, password, created_at, updated_at +` + +type CreateUserParams struct { + Email string + Password string +} + +func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (User, error) { + row := q.db.QueryRow(ctx, createUser, arg.Email, arg.Password) + var i User + err := row.Scan( + &i.ID, + &i.Email, + &i.Password, + &i.CreatedAt, + &i.UpdatedAt, + ) + return i, err +} + +const deleteUser = `-- name: DeleteUser :exec +DELETE FROM users +WHERE id = $1 +` + +func (q *Queries) DeleteUser(ctx context.Context, id pgtype.UUID) error { + _, err := q.db.Exec(ctx, deleteUser, id) + return err +} + +const getUser = `-- name: GetUser :one +select id, email, password, created_at, updated_at from users +where id = $1 limit 1 +` + +func (q *Queries) GetUser(ctx context.Context, id pgtype.UUID) (User, error) { + row := q.db.QueryRow(ctx, getUser, id) + var i User + err := row.Scan( + &i.ID, + &i.Email, + &i.Password, + &i.CreatedAt, + &i.UpdatedAt, + ) + return i, err +} diff --git a/migrations/20260419141635_create_users_table.sql b/migrations/20260419141635_create_users_table.sql index 9fb3812..25fac46 100644 --- a/migrations/20260419141635_create_users_table.sql +++ b/migrations/20260419141635_create_users_table.sql @@ -1,6 +1,6 @@ -- +goose Up create table users ( - id uuid primary uuidv4(), + id uuid primary key default uuidv4(), email varchar(255) not null unique, password varchar(255) not null, created_at timestamptz not null default now(), diff --git a/sqlc.yaml b/sqlc.yaml index 6a56b16..7d52142 100644 --- a/sqlc.yaml +++ b/sqlc.yaml @@ -4,7 +4,17 @@ cloud: project: "" hostname: "" servers: [] -sql: [] +sql: + - engine: 'postgresql' + schema: 'migrations/*.sql' + queries: 'internal/db/users/queries.sql' + gen: + go: + package: "usersdb" + out: "internal/db/users" + sql_package: "pgx/v5" + emit_json_tags: false + emit_interface: true overrides: go: null plugins: []