From e9c59948c2f17a9314a7282f853887cab1c9516a Mon Sep 17 00:00:00 2001 From: npmrun <1549469775@qq.com> Date: Mon, 1 Jun 2026 11:35:36 +0800 Subject: [PATCH] fix bug --- packages/drizzle-pkg/lib/schema/auth.ts | 7 ++++++- server/service/auth/index.ts | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/drizzle-pkg/lib/schema/auth.ts b/packages/drizzle-pkg/lib/schema/auth.ts index 8d29396..3f623dd 100644 --- a/packages/drizzle-pkg/lib/schema/auth.ts +++ b/packages/drizzle-pkg/lib/schema/auth.ts @@ -1,6 +1,9 @@ import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core"; import { sql } from "drizzle-orm"; +export const UserRoles = ["admin", "user"] as const; +export type UserRole = (typeof UserRoles)[number]; + export const users = sqliteTable("users", { id: integer().primaryKey(), username: text().notNull().unique(), @@ -8,7 +11,9 @@ export const users = sqliteTable("users", { nickname: text(), password: text().notNull(), avatar: text(), - role: text().notNull().default("user"), + role: text("role", { enum: UserRoles }) + .notNull() + .default("user"), status: text().notNull().default("active"), createdAt: integer("created_at", { mode: "timestamp_ms" }).defaultNow().notNull(), updatedAt: integer("updated_at", { mode: "timestamp_ms" }) diff --git a/server/service/auth/index.ts b/server/service/auth/index.ts index 3af1037..23c0319 100644 --- a/server/service/auth/index.ts +++ b/server/service/auth/index.ts @@ -1,5 +1,5 @@ import { dbGlobal } from "drizzle-pkg/lib/db"; -import { sessions, users } from "drizzle-pkg/lib/schema/auth"; +import { sessions, UserRole, users } from "drizzle-pkg/lib/schema/auth"; import { and, eq, gt, lte, sql } from "drizzle-orm"; import { isUniqueConflictExceptField, isUniqueConflictOnField } from "#server/utils/db-unique-constraint"; import log4js from "logger"; @@ -21,7 +21,7 @@ export type MinimalUser = { id: number; username: string; email: string | null; - role: string; + role: UserRole; nickname: string | null; avatar: string | null; };