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:",