From 484ecd85a31cccdd39b55e4d77365d2a70d331d3 Mon Sep 17 00:00:00 2001 From: imbytecat Date: Wed, 21 Jan 2026 15:47:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E5=B9=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加本地数据库包依赖以支持项目数据库功能 - 导出 todoTable 以供数据库 schema 使用 - 移除对 todo 模式的导出 - 删除待办事项数据表的定义配置 - 重命名文件以更准确地反映其用途,将数据库相关工具函数集中到新的工具文件中。 - 将数据库创建函数的导入路径从 '@/db' 更新为 '@/db/utils'。 - 将数据库包版本更新为1.0.0并添加对工作区中数据库包的依赖。 --- apps/server/package.json | 1 + apps/server/src/db/schema.ts | 1 + apps/server/src/db/schema/index.ts | 1 - apps/server/src/db/schema/todo.ts | 15 --------------- apps/server/src/db/{index.ts => utils.ts} | 0 apps/server/src/orpc/middlewares/db.ts | 2 +- bun.lock | 3 ++- 7 files changed, 5 insertions(+), 18 deletions(-) create mode 100644 apps/server/src/db/schema.ts delete mode 100644 apps/server/src/db/schema/index.ts delete mode 100644 apps/server/src/db/schema/todo.ts rename apps/server/src/db/{index.ts => utils.ts} (100%) diff --git a/apps/server/package.json b/apps/server/package.json index db9e59d..bad833d 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -15,6 +15,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { + "@furtherverse/database": "workspace:*", "@orpc/client": "catalog:", "@orpc/contract": "catalog:", "@orpc/server": "catalog:", diff --git a/apps/server/src/db/schema.ts b/apps/server/src/db/schema.ts new file mode 100644 index 0000000..23d4231 --- /dev/null +++ b/apps/server/src/db/schema.ts @@ -0,0 +1 @@ +export { todoTable } from '@furtherverse/database/postgres/schema/index' diff --git a/apps/server/src/db/schema/index.ts b/apps/server/src/db/schema/index.ts deleted file mode 100644 index a1cad6c..0000000 --- a/apps/server/src/db/schema/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './todo' diff --git a/apps/server/src/db/schema/todo.ts b/apps/server/src/db/schema/todo.ts deleted file mode 100644 index ce7b280..0000000 --- a/apps/server/src/db/schema/todo.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { sql } from 'drizzle-orm' -import { boolean, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core' - -export const todoTable = pgTable('todo', { - id: uuid('id').primaryKey().default(sql`uuidv7()`), - title: text('title').notNull(), - completed: boolean('completed').notNull().default(false), - createdAt: timestamp('created_at', { withTimezone: true }) - .notNull() - .defaultNow(), - updatedAt: timestamp('updated_at', { withTimezone: true }) - .notNull() - .defaultNow() - .$onUpdateFn(() => new Date()), -}) diff --git a/apps/server/src/db/index.ts b/apps/server/src/db/utils.ts similarity index 100% rename from apps/server/src/db/index.ts rename to apps/server/src/db/utils.ts diff --git a/apps/server/src/orpc/middlewares/db.ts b/apps/server/src/orpc/middlewares/db.ts index 01d55ce..40c9828 100644 --- a/apps/server/src/orpc/middlewares/db.ts +++ b/apps/server/src/orpc/middlewares/db.ts @@ -1,5 +1,5 @@ import { os } from '@orpc/server' -import { createDb } from '@/db' +import { createDb } from '@/db/utils' const IS_SERVERLESS = false // TODO: 这里需要优化 diff --git a/bun.lock b/bun.lock index 010d935..19f8b80 100644 --- a/bun.lock +++ b/bun.lock @@ -21,6 +21,7 @@ "name": "@furtherverse/server", "version": "1.0.0", "dependencies": { + "@furtherverse/database": "workspace:*", "@orpc/client": "catalog:", "@orpc/contract": "catalog:", "@orpc/server": "catalog:", @@ -64,7 +65,7 @@ }, "packages/database": { "name": "@furtherverse/database", - "version": "0.0.0", + "version": "1.0.0", "dependencies": { "drizzle-orm": "catalog:", "uuid": "catalog:",