feat: refactor planetscale to neon

app/(main)/Footer.tsx

@@ -1,4 +1,4 @@
-import { sql } from 'drizzle-orm'
+import { count, isNotNull } from 'drizzle-orm'
 import Link from 'next/link'
 import React from 'react'
 
@@ -8,6 +8,7 @@ import { Container } from '~/components/ui/Container'
 import { kvKeys } from '~/config/kv'
 import { navigationItems } from '~/config/nav'
 import { db } from '~/db'
+import { subscribers } from '~/db/schema'
 import { env } from '~/env.mjs'
 import { prettifyNumber } from '~/lib/math'
 import { redis } from '~/lib/redis'
@@ -98,26 +99,20 @@ async function LastVisitorInfo() {
 }
 
 export async function Footer() {
- const {
- rows: [count],
- } = await db.execute(
- sql`SELECT 
- (SELECT COUNT(*) FROM subscribers WHERE subscribed_at IS NOT NULL) as subscribers`
- )
+ const [subs] = await db
+ .select({
+  subCount: count(),
+ })
+ .from(subscribers)
+  .where(isNotNull(subscribers.subscribedAt))
 
  return (
  <footer className="mt-32">
  <Container.Outer>
  <div className="border-t border-zinc-100 pb-16 pt-10 dark:border-zinc-700/40">
  <Container.Inner>
  <div className="mx-auto mb-8 max-w-md">
- <Newsletter
- subCount={
- typeof count !== 'undefined' && 'subscribers' in count
- ? count.subscribers
- : undefined
- }
- />
+ <Newsletter subCount={`${subs?.subCount ?? '0'}`} />
  </div>
  <div className="flex flex-col items-center justify-between gap-6 sm:flex-row">
  <p className="text-sm text-zinc-500/80 dark:text-zinc-400/80">

app/admin/comments/page.tsx

@@ -24,7 +24,11 @@ import { clientFetch } from '~/sanity/lib/client'
 export default async function AdminCommentsPage() {
  const {
  rows: [commentsCount],
- } = await db.execute<{ today_count: number }>(
+ } = await db.execute<{
+ today_count: number
+ this_week_count: number
+ this_month_count: number
+ }>(
  sql`SELECT 
  (SELECT COUNT(*) FROM comments WHERE DATE(created_at) = CURDATE()) as today_count,
  (SELECT COUNT(*) FROM comments WHERE YEARWEEK(created_at, 1) = YEARWEEK(CURDATE(), 1)) as this_week_count,

app/admin/newsletters/page.tsx

@@ -18,7 +18,7 @@ import { newsletters } from '~/db/schema'
 export default async function AdminNewslettersPage() {
  const {
  rows: [count],
- } = await db.execute<{ today_count: number }>(
+ } = await db.execute<{ total: number }>(
  sql`SELECT 
  (SELECT COUNT(*) FROM newsletters) as total`
  )

app/admin/page.tsx

@@ -7,7 +7,11 @@ import { db } from '~/db'
 export default async function AdminPage() {
  const {
  rows: [count],
- } = await db.execute<{ today_count: number }>(
+ } = await db.execute<{
+ comments: number
+ subscribers: number
+ guestbook: number
+ }>(
  sql`SELECT 
  (SELECT COUNT(*) FROM comments) as comments,
  (SELECT COUNT(*) FROM subscribers WHERE subscribed_at IS NOT NULL) as subscribers,

app/admin/subscribers/page.tsx

@@ -18,7 +18,7 @@ import { subscribers } from '~/db/schema'
 export default async function AdminSubscribersPage() {
  const {
  rows: [count],
- } = await db.execute<{ today_count: number }>(
+ } = await db.execute<{ total: number }>(
  sql`SELECT 
  (SELECT COUNT(*) FROM subscribers WHERE subscribed_at IS NOT NULL) as total`
  )

app/api/comments/[id]/route.ts

@@ -120,7 +120,7 @@ export async function POST(req: NextRequest, { params }: Params) {
  lastName: user.lastName,
  imageUrl: user.imageUrl,
  },
- parentId: parentId ? (parentId as bigint) : null,
+ parentId: parentId ? (parentId as number) : null,
  }
 
  if (parentId && env.NODE_ENV === 'production') {
@@ -160,11 +160,16 @@ export async function POST(req: NextRequest, { params }: Params) {
  }
  }
 
- const { insertId } = await db.insert(comments).values(commentData)
+ const [newComment] = await db
+ .insert(comments)
+ .values(commentData)
+ .returning({
+ newId: comments.id,
+ })
 
  return NextResponse.json({
  ...commentData,
- id: CommentHashids.encode(insertId),
+ id: CommentHashids.encode(newComment!.newId),
  createdAt: new Date(),
  parentId: hashedParentId,
  } satisfies CommentDto)

app/api/guestbook/route.ts

@@ -78,12 +78,17 @@ export async function POST(req: NextRequest) {
  })
  }
 
- const { insertId } = await db.insert(guestbook).values(guestbookData)
+ const [newGuestbook] = await db
+ .insert(guestbook)
+ .values(guestbookData)
+ .returning({
+ newId: guestbook.id,
+ })
 
  return NextResponse.json(
  {
  ...guestbookData,
- id: GuestbookHashids.encode(insertId),
+ id: GuestbookHashids.encode(newGuestbook!.newId),
  createdAt: new Date(),
  } satisfies GuestbookDto,
  {

db/index.ts

@@ -1,13 +1,8 @@
-import { connect } from '@planetscale/database'
-import { drizzle } from 'drizzle-orm/planetscale-serverless'
+import { Pool } from '@neondatabase/serverless'
+import { drizzle } from 'drizzle-orm/neon-serverless'
 
 import { env } from '~/env.mjs'
 
 // create the connection
-const connection = connect({
- host: env.DATABASE_HOST,
- username: env.DATABASE_USERNAME,
- password: env.DATABASE_PASSWORD,
-})
-
-export const db = drizzle(connection)
+const pool = new Pool({ connectionString: env.DATABASE_URL })
+export const db = drizzle(pool)

db/migrations/0000_shallow_iron_fist.sql

@@ -0,0 +1,39 @@
+CREATE TABLE IF NOT EXISTS "comments" (
+ "id" serial PRIMARY KEY NOT NULL,
+ "user_id" varchar(200) NOT NULL,
+ "user_info" json,
+ "post_id" varchar(100) NOT NULL,
+ "parent_id" integer,
+ "body" json,
+ "created_at" timestamp DEFAULT now(),
+ "updated_at" timestamp DEFAULT now()
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "guestbook" (
+ "id" serial PRIMARY KEY NOT NULL,
+ "user_id" varchar(200) NOT NULL,
+ "user_info" json,
+ "message" text NOT NULL,
+ "created_at" timestamp DEFAULT now(),
+ "updated_at" timestamp DEFAULT now()
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "newsletters" (
+ "id" serial PRIMARY KEY NOT NULL,
+ "subject" varchar(200),
+ "body" text,
+ "sent_at" timestamp,
+ "created_at" timestamp DEFAULT now(),
+ "updated_at" timestamp DEFAULT now()
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "subscribers" (
+ "id" serial PRIMARY KEY NOT NULL,
+ "email" varchar(120),
+ "token" varchar(50),
+ "subscribed_at" timestamp,
+ "unsubscribed_at" timestamp,
+ "updated_at" timestamp DEFAULT now()
+);
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "post_idx" ON "comments" ("post_id");