diff --git a/apps/server/src/server/api/context.ts b/apps/server/src/server/api/context.ts index b7f63e2..9d4772f 100644 --- a/apps/server/src/server/api/context.ts +++ b/apps/server/src/server/api/context.ts @@ -1,4 +1,4 @@ -import type { Database } from '@/server/db' +import type { DB } from '@/server/db' /** * 基础 Context - 所有请求都包含的上下文 @@ -11,7 +11,7 @@ export interface BaseContext { * 数据库 Context - 通过 db middleware 扩展 */ export interface DBContext extends BaseContext { - db: Database + db: DB } /** diff --git a/apps/server/src/server/api/middlewares/db.middleware.ts b/apps/server/src/server/api/middlewares/db.middleware.ts index 373089e..24f6bfc 100644 --- a/apps/server/src/server/api/middlewares/db.middleware.ts +++ b/apps/server/src/server/api/middlewares/db.middleware.ts @@ -1,11 +1,11 @@ import { os } from '@orpc/server' -import { getDb } from '@/server/db' +import { getDB } from '@/server/db' export const db = os.middleware(async ({ context, next }) => { return next({ context: { ...context, - db: getDb(), + db: getDB(), }, }) }) diff --git a/apps/server/src/server/db/index.ts b/apps/server/src/server/db/index.ts index 4646b5c..fee948f 100644 --- a/apps/server/src/server/db/index.ts +++ b/apps/server/src/server/db/index.ts @@ -2,7 +2,7 @@ import { drizzle } from 'drizzle-orm/postgres-js' import { env } from '@/env' import * as schema from '@/server/db/schema' -export const createDb = () => +export const createDB = () => drizzle({ connection: { url: env.DATABASE_URL, @@ -11,17 +11,17 @@ export const createDb = () => schema, }) -export type Database = ReturnType +export type DB = ReturnType -export const getDb = (() => { - let db: Database | null = null +export const getDB = (() => { + let db: DB | null = null - return (singleton = true): Database => { + return (singleton = true): DB => { if (!singleton) { - return createDb() + return createDB() } - db ??= createDb() + db ??= createDB() return db } })()