From 588147a32c38ca85c0fcfc4952ef511c615dce86 Mon Sep 17 00:00:00 2001 From: TZGyn Date: Tue, 15 Aug 2023 19:03:05 +0800 Subject: [PATCH] Moved drizzle db to separate file --- app/api/bookmark/route.ts | 5 +++-- app/dashboard/page.tsx | 3 ++- lib/db.ts | 9 +++++++++ lib/schema.ts | 9 --------- 4 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 lib/db.ts diff --git a/app/api/bookmark/route.ts b/app/api/bookmark/route.ts index 5ac414c..74f1df7 100644 --- a/app/api/bookmark/route.ts +++ b/app/api/bookmark/route.ts @@ -1,6 +1,7 @@ import { bookmarkSchema, newBookmarkSchema } from '@/types' import { NextRequest, NextResponse } from 'next/server' -import { db, bookmark } from '@/lib/schema' +import { bookmark } from '@/lib/schema' +import { db } from '@/lib/db' import { eq } from 'drizzle-orm' export const GET = async () => { @@ -37,7 +38,7 @@ export const PATCH = async (request: NextRequest) => { return NextResponse.json({ message: 'Bookmark Updated' }) } - return NextResponse.json({ message: 'Invalid Bookmark' }) + return NextResponse.json(updateBookmark.error) } export const DELETE = async (request: NextRequest) => { diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index e1cb0f5..f146c18 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -1,6 +1,7 @@ import { BookmarkCard } from '@/components/bookmarkCard' import { bookmarkSchema } from '@/types' -import { db, bookmark } from '@/lib/schema' +import { bookmark } from '@/lib/schema' +import { db } from '@/lib/db' import EditBookmarkForm from '@/components/editBookmarkForm' export const dynamic = 'force-dynamic' diff --git a/lib/db.ts b/lib/db.ts new file mode 100644 index 0000000..1041bf3 --- /dev/null +++ b/lib/db.ts @@ -0,0 +1,9 @@ +import { drizzle } from 'drizzle-orm/postgres-js' +import postgres from 'postgres' +import * as schema from './schema' + +const client = postgres( + process.env.DATABASE_URL ?? + 'postgres://postgres:password@127.0.0.1:5432/next-dashboard' +) +export const db = drizzle(client, { schema }) diff --git a/lib/schema.ts b/lib/schema.ts index edbe9d0..46fda81 100644 --- a/lib/schema.ts +++ b/lib/schema.ts @@ -1,5 +1,3 @@ -import { drizzle } from 'drizzle-orm/postgres-js' -import postgres from 'postgres' import { relations } from 'drizzle-orm' import { pgTable, @@ -10,13 +8,6 @@ import { integer, } from 'drizzle-orm/pg-core' -const client = postgres( - process.env.DATABASE_URL ?? - 'postgres://postgres:password@127.0.0.1:5432/next-dashboard' -) - -export const db = drizzle(client) - // export const user = pgTable('users', { // id: serial('id').primaryKey(), // name: text('name'),