feat: 统一sql命名、函数命名
This commit is contained in:
@@ -10,36 +10,36 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
const clearSysUserRoles = `-- name: ClearSysUserRoles :exec
|
||||
const clearUserRoles = `-- name: ClearUserRoles :exec
|
||||
DELETE
|
||||
FROM sys_user_role
|
||||
WHERE user_id = $1
|
||||
`
|
||||
|
||||
func (q *Queries) ClearSysUserRoles(ctx context.Context, userID int32) error {
|
||||
_, err := q.db.Exec(ctx, clearSysUserRoles, userID)
|
||||
func (q *Queries) ClearUserRoles(ctx context.Context, userID int32) error {
|
||||
_, err := q.db.Exec(ctx, clearUserRoles, userID)
|
||||
return err
|
||||
}
|
||||
|
||||
const countSysUsers = `-- name: CountSysUsers :one
|
||||
const countUsers = `-- name: CountUsers :one
|
||||
SELECT COUNT(*)
|
||||
FROM sys_users
|
||||
WHERE ($1::text = '' OR username ILIKE '%' || $1 || '%')
|
||||
`
|
||||
|
||||
func (q *Queries) CountSysUsers(ctx context.Context, username string) (int64, error) {
|
||||
row := q.db.QueryRow(ctx, countSysUsers, username)
|
||||
func (q *Queries) CountUsers(ctx context.Context, username string) (int64, error) {
|
||||
row := q.db.QueryRow(ctx, countUsers, username)
|
||||
var count int64
|
||||
err := row.Scan(&count)
|
||||
return count, err
|
||||
}
|
||||
|
||||
const createSysUser = `-- name: CreateSysUser :exec
|
||||
const createUser = `-- name: CreateUser :exec
|
||||
INSERT INTO sys_users (account, username, password_hash, status, avatar_id)
|
||||
VALUES ($1, $2, $3, $4, $5)
|
||||
`
|
||||
|
||||
type CreateSysUserParams struct {
|
||||
type CreateUserParams struct {
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
PasswordHash string `json:"password_hash"`
|
||||
@@ -47,8 +47,8 @@ type CreateSysUserParams struct {
|
||||
AvatarID *int32 `json:"avatar_id"`
|
||||
}
|
||||
|
||||
func (q *Queries) CreateSysUser(ctx context.Context, arg CreateSysUserParams) error {
|
||||
_, err := q.db.Exec(ctx, createSysUser,
|
||||
func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) error {
|
||||
_, err := q.db.Exec(ctx, createUser,
|
||||
arg.Account,
|
||||
arg.Username,
|
||||
arg.PasswordHash,
|
||||
@@ -58,34 +58,34 @@ func (q *Queries) CreateSysUser(ctx context.Context, arg CreateSysUserParams) er
|
||||
return err
|
||||
}
|
||||
|
||||
type CreateSysUserRoleParams struct {
|
||||
type CreateUserRoleParams struct {
|
||||
UserID int32 `json:"user_id"`
|
||||
RoleID int32 `json:"role_id"`
|
||||
}
|
||||
|
||||
const deleteSysUser = `-- name: DeleteSysUser :execrows
|
||||
const deleteUser = `-- name: DeleteUser :execrows
|
||||
DELETE
|
||||
FROM sys_users
|
||||
WHERE id = $1
|
||||
AND id <> 1
|
||||
`
|
||||
|
||||
func (q *Queries) DeleteSysUser(ctx context.Context, id int32) (int64, error) {
|
||||
result, err := q.db.Exec(ctx, deleteSysUser, id)
|
||||
func (q *Queries) DeleteUser(ctx context.Context, id int32) (int64, error) {
|
||||
result, err := q.db.Exec(ctx, deleteUser, id)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return result.RowsAffected(), nil
|
||||
}
|
||||
|
||||
const getActiveSysUserByID = `-- name: GetActiveSysUserByID :one
|
||||
const getActiveUserByID = `-- name: GetActiveUserByID :one
|
||||
SELECT id, account, username, status
|
||||
FROM sys_users
|
||||
WHERE id = $1
|
||||
AND status = 1
|
||||
`
|
||||
|
||||
type GetActiveSysUserByIDRow struct {
|
||||
type GetActiveUserByIDRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
@@ -93,9 +93,9 @@ type GetActiveSysUserByIDRow struct {
|
||||
}
|
||||
|
||||
// 场景:用户登录、获取个人信息、刷新 Token(严格校验 status = 1)
|
||||
func (q *Queries) GetActiveSysUserByID(ctx context.Context, id int32) (GetActiveSysUserByIDRow, error) {
|
||||
row := q.db.QueryRow(ctx, getActiveSysUserByID, id)
|
||||
var i GetActiveSysUserByIDRow
|
||||
func (q *Queries) GetActiveUserByID(ctx context.Context, id int32) (GetActiveUserByIDRow, error) {
|
||||
row := q.db.QueryRow(ctx, getActiveUserByID, id)
|
||||
var i GetActiveUserByIDRow
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Account,
|
||||
@@ -105,7 +105,92 @@ func (q *Queries) GetActiveSysUserByID(ctx context.Context, id int32) (GetActive
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getSysAdminMenus = `-- name: GetSysAdminMenus :many
|
||||
const getUserByAccount = `-- name: GetUserByAccount :one
|
||||
SELECT u.id,
|
||||
u.account,
|
||||
u.username,
|
||||
u.password_hash,
|
||||
u.status,
|
||||
u.avatar_id,
|
||||
f.file_url AS avatar_url,
|
||||
u.created_at,
|
||||
u.updated_at
|
||||
FROM sys_users u
|
||||
LEFT JOIN files f ON u.avatar_id = f.id
|
||||
WHERE u.account = $1
|
||||
`
|
||||
|
||||
type GetUserByAccountRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
PasswordHash string `json:"password_hash"`
|
||||
Status int16 `json:"status"`
|
||||
AvatarID *int32 `json:"avatar_id"`
|
||||
AvatarUrl *string `json:"avatar_url"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
func (q *Queries) GetUserByAccount(ctx context.Context, account string) (GetUserByAccountRow, error) {
|
||||
row := q.db.QueryRow(ctx, getUserByAccount, account)
|
||||
var i GetUserByAccountRow
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Account,
|
||||
&i.Username,
|
||||
&i.PasswordHash,
|
||||
&i.Status,
|
||||
&i.AvatarID,
|
||||
&i.AvatarUrl,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getUserByID = `-- name: GetUserByID :one
|
||||
SELECT u.id,
|
||||
u.account,
|
||||
u.username,
|
||||
u.avatar_id,
|
||||
u.status,
|
||||
f.file_url AS avatar_url,
|
||||
u.created_at,
|
||||
u.updated_at
|
||||
FROM sys_users u
|
||||
LEFT JOIN files f ON u.avatar_id = f.id
|
||||
WHERE u.id = $1
|
||||
`
|
||||
|
||||
type GetUserByIDRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
AvatarID *int32 `json:"avatar_id"`
|
||||
Status int16 `json:"status"`
|
||||
AvatarUrl *string `json:"avatar_url"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
func (q *Queries) GetUserByID(ctx context.Context, id int32) (GetUserByIDRow, error) {
|
||||
row := q.db.QueryRow(ctx, getUserByID, id)
|
||||
var i GetUserByIDRow
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Account,
|
||||
&i.Username,
|
||||
&i.AvatarID,
|
||||
&i.Status,
|
||||
&i.AvatarUrl,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const listAdminMenus = `-- name: ListAdminMenus :many
|
||||
SELECT id, name, path, component, type, hidden, sort, status, parent_id, icon, created_at, updated_at
|
||||
FROM sys_menus
|
||||
WHERE status = 1
|
||||
@@ -113,8 +198,8 @@ WHERE status = 1
|
||||
ORDER BY sort, id
|
||||
`
|
||||
|
||||
func (q *Queries) GetSysAdminMenus(ctx context.Context) ([]SysMenu, error) {
|
||||
rows, err := q.db.Query(ctx, getSysAdminMenus)
|
||||
func (q *Queries) ListAdminMenus(ctx context.Context) ([]SysMenu, error) {
|
||||
rows, err := q.db.Query(ctx, listAdminMenus)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -146,14 +231,14 @@ func (q *Queries) GetSysAdminMenus(ctx context.Context) ([]SysMenu, error) {
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const getSysAdminPermissions = `-- name: GetSysAdminPermissions :many
|
||||
const listAdminPermissionCodes = `-- name: ListAdminPermissionCodes :many
|
||||
SELECT code
|
||||
FROM sys_permissions
|
||||
WHERE type = 0
|
||||
`
|
||||
|
||||
func (q *Queries) GetSysAdminPermissions(ctx context.Context) ([]*string, error) {
|
||||
rows, err := q.db.Query(ctx, getSysAdminPermissions)
|
||||
func (q *Queries) ListAdminPermissionCodes(ctx context.Context) ([]*string, error) {
|
||||
rows, err := q.db.Query(ctx, listAdminPermissionCodes)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -172,7 +257,7 @@ func (q *Queries) GetSysAdminPermissions(ctx context.Context) ([]*string, error)
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const getSysUserApis = `-- name: GetSysUserApis :many
|
||||
const listUserApis = `-- name: ListUserApis :many
|
||||
SELECT DISTINCT a.id,
|
||||
a.PATH,
|
||||
a.METHOD
|
||||
@@ -187,21 +272,21 @@ WHERE u.id = $1
|
||||
AND r.status = 1
|
||||
`
|
||||
|
||||
type GetSysUserApisRow struct {
|
||||
type ListUserApisRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Path string `json:"path"`
|
||||
Method string `json:"method"`
|
||||
}
|
||||
|
||||
func (q *Queries) GetSysUserApis(ctx context.Context, id int32) ([]GetSysUserApisRow, error) {
|
||||
rows, err := q.db.Query(ctx, getSysUserApis, id)
|
||||
func (q *Queries) ListUserApis(ctx context.Context, id int32) ([]ListUserApisRow, error) {
|
||||
rows, err := q.db.Query(ctx, listUserApis, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []GetSysUserApisRow{}
|
||||
items := []ListUserApisRow{}
|
||||
for rows.Next() {
|
||||
var i GetSysUserApisRow
|
||||
var i ListUserApisRow
|
||||
if err := rows.Scan(&i.ID, &i.Path, &i.Method); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -213,92 +298,7 @@ func (q *Queries) GetSysUserApis(ctx context.Context, id int32) ([]GetSysUserApi
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const getSysUserByAccount = `-- name: GetSysUserByAccount :one
|
||||
SELECT u.id,
|
||||
u.account,
|
||||
u.username,
|
||||
u.password_hash,
|
||||
u.status,
|
||||
u.avatar_id,
|
||||
f.file_path AS avatar_url,
|
||||
u.created_at,
|
||||
u.updated_at
|
||||
FROM sys_users u
|
||||
LEFT JOIN files f ON u.avatar_id = f.id
|
||||
WHERE u.account = $1
|
||||
`
|
||||
|
||||
type GetSysUserByAccountRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
PasswordHash string `json:"password_hash"`
|
||||
Status int16 `json:"status"`
|
||||
AvatarID *int32 `json:"avatar_id"`
|
||||
AvatarUrl *string `json:"avatar_url"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
func (q *Queries) GetSysUserByAccount(ctx context.Context, account string) (GetSysUserByAccountRow, error) {
|
||||
row := q.db.QueryRow(ctx, getSysUserByAccount, account)
|
||||
var i GetSysUserByAccountRow
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Account,
|
||||
&i.Username,
|
||||
&i.PasswordHash,
|
||||
&i.Status,
|
||||
&i.AvatarID,
|
||||
&i.AvatarUrl,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getSysUserByID = `-- name: GetSysUserByID :one
|
||||
SELECT u.id,
|
||||
u.account,
|
||||
u.username,
|
||||
u.avatar_id,
|
||||
u.status,
|
||||
f.file_path AS avatar_url,
|
||||
u.created_at,
|
||||
u.updated_at
|
||||
FROM sys_users u
|
||||
LEFT JOIN files f ON u.avatar_id = f.id
|
||||
WHERE u.id = $1
|
||||
`
|
||||
|
||||
type GetSysUserByIDRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
AvatarID *int32 `json:"avatar_id"`
|
||||
Status int16 `json:"status"`
|
||||
AvatarUrl *string `json:"avatar_url"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
func (q *Queries) GetSysUserByID(ctx context.Context, id int32) (GetSysUserByIDRow, error) {
|
||||
row := q.db.QueryRow(ctx, getSysUserByID, id)
|
||||
var i GetSysUserByIDRow
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Account,
|
||||
&i.Username,
|
||||
&i.AvatarID,
|
||||
&i.Status,
|
||||
&i.AvatarUrl,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getSysUserMenus = `-- name: GetSysUserMenus :many
|
||||
const listUserMenus = `-- name: ListUserMenus :many
|
||||
SELECT DISTINCT m.id, m.name, m.path, m.component, m.type, m.hidden, m.sort, m.status, m.parent_id, m.icon, m.created_at, m.updated_at
|
||||
FROM sys_users u
|
||||
JOIN sys_user_role ur ON ur.user_id = u.id
|
||||
@@ -314,8 +314,8 @@ WHERE u.id = $1
|
||||
ORDER BY m.sort, m.id
|
||||
`
|
||||
|
||||
func (q *Queries) GetSysUserMenus(ctx context.Context, id int32) ([]SysMenu, error) {
|
||||
rows, err := q.db.Query(ctx, getSysUserMenus, id)
|
||||
func (q *Queries) ListUserMenus(ctx context.Context, id int32) ([]SysMenu, error) {
|
||||
rows, err := q.db.Query(ctx, listUserMenus, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -347,7 +347,7 @@ func (q *Queries) GetSysUserMenus(ctx context.Context, id int32) ([]SysMenu, err
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const getSysUserPermissions = `-- name: GetSysUserPermissions :many
|
||||
const listUserPermissionCodes = `-- name: ListUserPermissionCodes :many
|
||||
SELECT DISTINCT p.code
|
||||
FROM sys_users u
|
||||
JOIN sys_user_role ur ON u.id = ur.user_id
|
||||
@@ -363,8 +363,8 @@ WHERE u.id = $1
|
||||
AND p."type" = 0
|
||||
`
|
||||
|
||||
func (q *Queries) GetSysUserPermissions(ctx context.Context, id int32) ([]*string, error) {
|
||||
rows, err := q.db.Query(ctx, getSysUserPermissions, id)
|
||||
func (q *Queries) ListUserPermissionCodes(ctx context.Context, id int32) ([]*string, error) {
|
||||
rows, err := q.db.Query(ctx, listUserPermissionCodes, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -383,15 +383,15 @@ func (q *Queries) GetSysUserPermissions(ctx context.Context, id int32) ([]*strin
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const getSysUserRoles = `-- name: GetSysUserRoles :many
|
||||
const listUserRoles = `-- name: ListUserRoles :many
|
||||
SELECT r.id, r.name, r.code, r.status, r.created_at, r.updated_at
|
||||
FROM sys_roles r
|
||||
JOIN sys_user_role ur ON r.id = ur.role_id
|
||||
WHERE ur.user_id = $1
|
||||
`
|
||||
|
||||
func (q *Queries) GetSysUserRoles(ctx context.Context, userID int32) ([]SysRole, error) {
|
||||
rows, err := q.db.Query(ctx, getSysUserRoles, userID)
|
||||
func (q *Queries) ListUserRoles(ctx context.Context, userID int32) ([]SysRole, error) {
|
||||
rows, err := q.db.Query(ctx, listUserRoles, userID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -417,13 +417,13 @@ func (q *Queries) GetSysUserRoles(ctx context.Context, userID int32) ([]SysRole,
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const listSysUsers = `-- name: ListSysUsers :many
|
||||
const listUsers = `-- name: ListUsers :many
|
||||
SELECT u.id,
|
||||
u.account,
|
||||
u.username,
|
||||
u.status,
|
||||
u.avatar_id,
|
||||
f.file_path AS avatar_url,
|
||||
f.file_url AS avatar_url,
|
||||
u.created_at,
|
||||
u.updated_at
|
||||
FROM sys_users u
|
||||
@@ -433,13 +433,13 @@ ORDER BY u.id
|
||||
LIMIT $1 OFFSET $2
|
||||
`
|
||||
|
||||
type ListSysUsersParams struct {
|
||||
type ListUsersParams struct {
|
||||
Limit int32 `json:"limit"`
|
||||
Offset int32 `json:"offset"`
|
||||
Username string `json:"username"`
|
||||
}
|
||||
|
||||
type ListSysUsersRow struct {
|
||||
type ListUsersRow struct {
|
||||
ID int32 `json:"id"`
|
||||
Account string `json:"account"`
|
||||
Username string `json:"username"`
|
||||
@@ -450,15 +450,15 @@ type ListSysUsersRow struct {
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
func (q *Queries) ListSysUsers(ctx context.Context, arg ListSysUsersParams) ([]ListSysUsersRow, error) {
|
||||
rows, err := q.db.Query(ctx, listSysUsers, arg.Limit, arg.Offset, arg.Username)
|
||||
func (q *Queries) ListUsers(ctx context.Context, arg ListUsersParams) ([]ListUsersRow, error) {
|
||||
rows, err := q.db.Query(ctx, listUsers, arg.Limit, arg.Offset, arg.Username)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []ListSysUsersRow{}
|
||||
items := []ListUsersRow{}
|
||||
for rows.Next() {
|
||||
var i ListSysUsersRow
|
||||
var i ListUsersRow
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.Account,
|
||||
@@ -479,7 +479,7 @@ func (q *Queries) ListSysUsers(ctx context.Context, arg ListSysUsersParams) ([]L
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const updateSysUser = `-- name: UpdateSysUser :execrows
|
||||
const updateUser = `-- name: UpdateUser :execrows
|
||||
UPDATE sys_users
|
||||
SET username = coalesce($1, username),
|
||||
status = coalesce($2, status),
|
||||
@@ -487,7 +487,7 @@ SET username = coalesce($1, username),
|
||||
WHERE id = $5
|
||||
`
|
||||
|
||||
type UpdateSysUserParams struct {
|
||||
type UpdateUserParams struct {
|
||||
Username *string `json:"username"`
|
||||
Status *int16 `json:"status"`
|
||||
UpdateAvatarID bool `json:"update_avatar_id"`
|
||||
@@ -495,8 +495,8 @@ type UpdateSysUserParams struct {
|
||||
ID int32 `json:"id"`
|
||||
}
|
||||
|
||||
func (q *Queries) UpdateSysUser(ctx context.Context, arg UpdateSysUserParams) (int64, error) {
|
||||
result, err := q.db.Exec(ctx, updateSysUser,
|
||||
func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (int64, error) {
|
||||
result, err := q.db.Exec(ctx, updateUser,
|
||||
arg.Username,
|
||||
arg.Status,
|
||||
arg.UpdateAvatarID,
|
||||
@@ -509,19 +509,19 @@ func (q *Queries) UpdateSysUser(ctx context.Context, arg UpdateSysUserParams) (i
|
||||
return result.RowsAffected(), nil
|
||||
}
|
||||
|
||||
const updateSysUserPassword = `-- name: UpdateSysUserPassword :execrows
|
||||
const updateUserPassword = `-- name: UpdateUserPassword :execrows
|
||||
UPDATE sys_users
|
||||
SET password_hash = $2
|
||||
WHERE id = $1
|
||||
`
|
||||
|
||||
type UpdateSysUserPasswordParams struct {
|
||||
type UpdateUserPasswordParams struct {
|
||||
ID int32 `json:"id"`
|
||||
PasswordHash string `json:"password_hash"`
|
||||
}
|
||||
|
||||
func (q *Queries) UpdateSysUserPassword(ctx context.Context, arg UpdateSysUserPasswordParams) (int64, error) {
|
||||
result, err := q.db.Exec(ctx, updateSysUserPassword, arg.ID, arg.PasswordHash)
|
||||
func (q *Queries) UpdateUserPassword(ctx context.Context, arg UpdateUserPasswordParams) (int64, error) {
|
||||
result, err := q.db.Exec(ctx, updateUserPassword, arg.ID, arg.PasswordHash)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user