migrate to DrizzleORM v1.0.0-beta.18

Author: akselotti

package.json

@@ -51,8 +51,8 @@
     "bits-ui": "^2.16.3",
     "clsx": "^2.1.1",
     "concurrently": "^9.2.1",
-    "drizzle-kit": "^0.31.9",
-    "drizzle-seed": "^0.3.1",
+    "drizzle-kit": "1.0.0-beta.18-7eb39f0",
+    "drizzle-seed": "1.0.0-beta.18-7eb39f0",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-svelte": "^3.15.2",
@@ -85,7 +85,7 @@
     "@oslojs/encoding": "^1.1.0",
     "@simplewebauthn/browser": "^13.3.0",
     "@simplewebauthn/server": "^13.3.0",
-    "drizzle-orm": "^0.45.1",
+    "drizzle-orm": "1.0.0-beta.18-7eb39f0",
     "mailgun.js": "^12.7.1",
     "mode-watcher": "^1.1.0",
     "node-cron": "^4.2.1",

pnpm-lock.yaml

@@ -14,7 +14,7 @@ export const retryPayment = form(retryPaymentSchema, async ({ memberId }) => {
   }
 
   // Verify the member belongs to this user and is awaiting_payment
-  const member = await db.query.member.findFirst({
+  const member = await db._query.member.findFirst({
     where: and(eq(table.member.id, memberId), eq(table.member.userId, event.locals.user.id)),
   });
 

src/lib/api/retry-payment.remote.ts

@@ -22,7 +22,7 @@ export function generateQrToken(): string {
  * @throws Error if user not found
  */
 export async function ensureUserHasQrToken(userId: string): Promise<string> {
-  const user = await db.query.user.findFirst({
+  const user = await db._query.user.findFirst({
     where: eq(table.user.id, userId),
     columns: {
       id: true,
@@ -46,7 +46,7 @@ export async function ensureUserHasQrToken(userId: string): Promise<string> {
     .where(and(eq(table.user.id, userId), isNull(table.user.qrToken)));
 
   // Re-read to get the actual token (ours or the concurrent one)
-  const updated = await db.query.user.findFirst({
+  const updated = await db._query.user.findFirst({
     where: eq(table.user.id, userId),
     columns: { qrToken: true },
   });
@@ -65,7 +65,7 @@ export async function ensureUserHasQrToken(userId: string): Promise<string> {
  * @returns User ID if valid, null otherwise
  */
 export async function verifyQrToken(token: string): Promise<string | null> {
-  const user = await db.query.user.findFirst({
+  const user = await db._query.user.findFirst({
     where: eq(table.user.qrToken, token),
     columns: {
       id: true,

src/lib/server/attendance/qr-token.ts

@@ -2,9 +2,10 @@ import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 import { env } from "$lib/server/env";
 import { dev } from "$app/environment";
-import * as schema from "$lib/server/db/schema";
+import * as schema from "./schema";
+import * as relations from "./relations";
 
 const client = postgres(env.DATABASE_URL, {
   ssl: dev ? undefined : "prefer", // Prefer SSL in production, optional in dev
 });
-export const db = drizzle(client, { schema, casing: "snake_case" });
+export const db = drizzle({ client, schema: { ...schema, ...relations }, casing: "snake_case" });

src/lib/server/db/index.ts

@@ -0,0 +1,70 @@
+import { relations } from "drizzle-orm/_relations";
+import {
+  user,
+  session,
+  passkey,
+  secondaryEmail,
+  membershipType,
+  membership,
+  member,
+  auditLog,
+} from "./schema";
+
+export const userRelations = relations(user, ({ many }) => ({
+  members: many(member),
+  sessions: many(session),
+  passkeys: many(passkey),
+  secondaryEmails: many(secondaryEmail),
+  auditLogs: many(auditLog),
+}));
+
+export const sessionRelations = relations(session, ({ one }) => ({
+  user: one(user, {
+    fields: [session.userId],
+    references: [user.id],
+  }),
+}));
+
+export const passkeyRelations = relations(passkey, ({ one }) => ({
+  user: one(user, {
+    fields: [passkey.userId],
+    references: [user.id],
+  }),
+}));
+
+export const secondaryEmailRelations = relations(secondaryEmail, ({ one }) => ({
+  user: one(user, {
+    fields: [secondaryEmail.userId],
+    references: [user.id],
+  }),
+}));
+
+export const membershipTypeRelations = relations(membershipType, ({ many }) => ({
+  memberships: many(membership),
+}));
+
+export const membershipRelations = relations(membership, ({ one, many }) => ({
+  membershipType: one(membershipType, {
+    fields: [membership.membershipTypeId],
+    references: [membershipType.id],
+  }),
+  members: many(member),
+}));
+
+export const memberRelations = relations(member, ({ one }) => ({
+  user: one(user, {
+    fields: [member.userId],
+    references: [user.id],
+  }),
+  membership: one(membership, {
+    fields: [member.membershipId],
+    references: [membership.id],
+  }),
+}));
+
+export const auditLogRelations = relations(auditLog, ({ one }) => ({
+  user: one(user, {
+    fields: [auditLog.userId],
+    references: [user.id],
+  }),
+}));

src/lib/server/db/relations.ts

@@ -1,4 +1,4 @@
-import { relations, sql } from "drizzle-orm";
+import { sql } from "drizzle-orm";
 import {
   boolean,
   bytea,
@@ -16,7 +16,7 @@ import {
 import * as v from "valibot";
 
 import { DEFAULT_CUSTOMISATION } from "../customisation/defaults";
-import { ADMIN_ROLE_VALUES, MEMBER_STATUS_VALUES, PREFERRED_LANGUAGE_VALUES } from "$lib/shared/enums";
+import { ADMIN_ROLE_VALUES, MEMBER_STATUS_VALUES, PREFERRED_LANGUAGE_VALUES } from "../../shared/enums";
 import type { AuthenticatorTransportFuture } from "@simplewebauthn/server";
 
 export type LocalizedString = { fi: string; en: string };
@@ -155,29 +155,6 @@ export const member = pgTable(
   ],
 );
 
-export const memberRelations = relations(member, ({ one }) => ({
-  user: one(user, {
-    fields: [member.userId],
-    references: [user.id],
-  }),
-  membership: one(membership, {
-    fields: [member.membershipId],
-    references: [membership.id],
-  }),
-}));
-
-export const membershipTypeRelations = relations(membershipType, ({ many }) => ({
-  memberships: many(membership),
-}));
-
-export const membershipRelations = relations(membership, ({ one, many }) => ({
-  membershipType: one(membershipType, {
-    fields: [membership.membershipTypeId],
-    references: [membershipType.id],
-  }),
-  members: many(member),
-}));
-
 export const auditLog = pgTable("audit_log", {
   id: text().primaryKey(),
   userId: text().references(() => user.id),

src/lib/server/db/schema.ts

@@ -12,15 +12,10 @@ try {
   if (!process.env.DATABASE_URL) throw new Error("DATABASE_URL is not set");
 
   const client = postgres(process.env.DATABASE_URL);
-  const db = drizzle(client, { schema: table, casing: "snake_case" });
+  const db = drizzle({ client, schema: table, casing: "snake_case" });
 
   console.log("Resetting database...");
-  await reset(db, {
-    user: table.user,
-    membership: table.membership,
-    member: table.member,
-    membershipType: table.membershipType,
-  });
+  await reset(db, table);
   console.log("Database reset!");
 
   console.log("Seeding database...");

src/lib/server/db/seed.ts

@@ -27,7 +27,7 @@ export async function checkAutoApprovalEligibility(
 ): Promise<boolean> {
   // Find the immediately preceding membership of the same type
   // (same membershipTypeId, endTime <= newMembership.startTime, most recent)
-  const precedingMembership = await db.query.membership.findFirst({
+  const precedingMembership = await db._query.membership.findFirst({
     where: and(
       eq(table.membership.membershipTypeId, newMembership.membershipTypeId),
       lte(table.membership.endTime, newMembership.startTime),
@@ -48,7 +48,7 @@ export async function checkAutoApprovalEligibility(
   // Check if user had an active member record for that preceding membership.
   // Only "active" qualifies — resigned members were deliberately removed by the
   // board at year-end (§8 p2) and should go through board review again.
-  const previousMember = await db.query.member.findFirst({
+  const previousMember = await db._query.member.findFirst({
     where: and(
       eq(table.member.userId, userId),
       eq(table.member.membershipId, precedingMembership.id),
@@ -76,7 +76,7 @@ export async function checkAutoApprovalEligibility(
  */
 async function checkStudentEmail(db: DbHandle, userId: string): Promise<boolean> {
   // Check primary email
-  const user = await db.query.user.findFirst({
+  const user = await db._query.user.findFirst({
     where: eq(table.user.id, userId),
     columns: { email: true },
   });

src/lib/server/payment/auto-approval.ts

@@ -110,11 +110,11 @@ async function createCheckoutSessionWithRetry(
  * @see {@link https://docs.stripe.com/checkout/quickstart}
  */
 export async function createSession(userId: string, membershipId: string, locale: Locale, description?: string | null) {
-  const membership = await db.query.membership.findFirst({
+  const membership = await db._query.membership.findFirst({
     where: eq(table.membership.id, membershipId),
     with: { membershipType: true },
   });
-  const user = await db.query.user.findFirst({
+  const user = await db._query.user.findFirst({
     where: eq(table.user.id, userId),
   });
   if (!membership || !user) {
@@ -162,7 +162,7 @@ export async function createSession(userId: string, membershipId: string, locale
  * This is used when a user with "awaiting_payment" status wants to complete their payment.
  */
 export async function resumeOrCreateSession(memberId: string, locale: Locale) {
-  const member = await db.query.member.findFirst({
+  const member = await db._query.member.findFirst({
     where: eq(table.member.id, memberId),
     with: {
       membership: {
@@ -306,7 +306,7 @@ export async function fulfillSession(sessionId: string) {
   // 3. Email failures are caught and logged without failing the transaction
   if (newStatus) {
     try {
-      const memberWithDetails = await db.query.member.findFirst({
+      const memberWithDetails = await db._query.member.findFirst({
         where: eq(table.member.id, memberId),
         with: {
           user: true,