From 7a4aff8e4be1338ccb19954c71329028f5b00039 Mon Sep 17 00:00:00 2001
From: Fred KISSIE <fredkiss3@gmail.com>
Date: Fri, 9 Jan 2026 01:17:05 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20use=20`clientId`=20and?=
 =?UTF-8?q?=20fix=20bad=20column=20name=20for=20decision=20and=20add=20`us?=
 =?UTF-8?q?erId`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/db/pg/schema/privateSchema.ts     |  8 ++++----
 server/db/sqlite/schema/privateSchema.ts | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/server/db/pg/schema/privateSchema.ts b/server/db/pg/schema/privateSchema.ts
index 7332ec73..fb7b4fed 100644
--- a/server/db/pg/schema/privateSchema.ts
+++ b/server/db/pg/schema/privateSchema.ts
@@ -17,7 +17,7 @@ import {
     users,
     exitNodes,
     sessions,
-    olms
+    clients
 } from "./schema";
 
 export const certificates = pgTable("certificates", {
@@ -305,14 +305,14 @@ export const approvals = pgTable("approvals", {
             onDelete: "cascade"
         })
         .notNull(),
-    olmId: varchar("olmId").references(() => olms.olmId, {
+    clientId: integer("clientId").references(() => clients.clientId, {
         onDelete: "cascade"
-    }), // olms reference user devices clients (in this case)
+    }), // clients reference user devices (in this case)
     userId: varchar("userId").references(() => users.userId, {
         // optionally tied to a user and in this case delete when the user deletes
         onDelete: "cascade"
     }),
-    decision: varchar("type")
+    decision: varchar("decision")
         .$type<"approved" | "denied" | "pending">()
         .default("pending")
         .notNull(),
diff --git a/server/db/sqlite/schema/privateSchema.ts b/server/db/sqlite/schema/privateSchema.ts
index 311bcf4b..70c04469 100644
--- a/server/db/sqlite/schema/privateSchema.ts
+++ b/server/db/sqlite/schema/privateSchema.ts
@@ -6,7 +6,7 @@ import {
     sqliteTable,
     text
 } from "drizzle-orm/sqlite-core";
-import { domains, exitNodes, olms, orgs, sessions, users } from "./schema";
+import { clients, domains, exitNodes, orgs, sessions, users } from "./schema";
 
 export const certificates = sqliteTable("certificates", {
     certId: integer("certId").primaryKey({ autoIncrement: true }),
@@ -297,10 +297,14 @@ export const approvals = sqliteTable("approvals", {
             onDelete: "cascade"
         })
         .notNull(),
-    olmId: text("olmId").references(() => olms.olmId, {
+    clientId: integer("clientId").references(() => clients.clientId, {
         onDelete: "cascade"
     }), // olms reference user devices clients
-    decision: text("type")
+    userId: text("userId").references(() => users.userId, {
+        // optionally tied to a user and in this case delete when the user deletes
+        onDelete: "cascade"
+    }),
+    decision: text("decision")
         .$type<"approved" | "denied" | "pending">()
         .default("pending")
         .notNull(),