From 4d7e25f97bb4df93acaf70f8b1390befecc52d68 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Mon, 28 Jul 2025 17:22:53 -0700
Subject: [PATCH] Complete migrations

---
 server/db/pg/schema.ts           | 2 +-
 server/lib/consts.ts             | 2 +-
 server/setup/migrationsPg.ts     | 4 +++-
 server/setup/migrationsSqlite.ts | 2 ++
 server/setup/scriptsPg/1.8.0.ts  | 9 ++++++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/db/pg/schema.ts b/server/db/pg/schema.ts
index 5709c9f8..b9228286 100644
--- a/server/db/pg/schema.ts
+++ b/server/db/pg/schema.ts
@@ -95,7 +95,7 @@ export const resources = pgTable("resources", {
     stickySession: boolean("stickySession").notNull().default(false),
     tlsServerName: varchar("tlsServerName"),
     setHostHeader: varchar("setHostHeader"),
-    enableProxy: boolean("enableProxy").notNull().default(true),
+    enableProxy: boolean("enableProxy").default(true),
 });
 
 export const targets = pgTable("targets", {
diff --git a/server/lib/consts.ts b/server/lib/consts.ts
index 70d4404a..cfe45620 100644
--- a/server/lib/consts.ts
+++ b/server/lib/consts.ts
@@ -2,7 +2,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 // This is a placeholder value replaced by the build process
-export const APP_VERSION = "1.7.3";
+export const APP_VERSION = "1.8.0";
 
 export const __FILENAME = fileURLToPath(import.meta.url);
 export const __DIRNAME = path.dirname(__FILENAME);
diff --git a/server/setup/migrationsPg.ts b/server/setup/migrationsPg.ts
index 6996999c..07ece65b 100644
--- a/server/setup/migrationsPg.ts
+++ b/server/setup/migrationsPg.ts
@@ -7,6 +7,7 @@ import { __DIRNAME, APP_VERSION } from "@server/lib/consts";
 import path from "path";
 import m1 from "./scriptsPg/1.6.0";
 import m2 from "./scriptsPg/1.7.0";
+import m3 from "./scriptsPg/1.8.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -14,7 +15,8 @@ import m2 from "./scriptsPg/1.7.0";
 // Define the migration list with versions and their corresponding functions
 const migrations = [
     { version: "1.6.0", run: m1 },
-    { version: "1.7.0", run: m2 }
+    { version: "1.7.0", run: m2 },
+    { version: "1.8.0", run: m3 }
     // Add new migrations here as they are created
 ] as {
     version: string;
diff --git a/server/setup/migrationsSqlite.ts b/server/setup/migrationsSqlite.ts
index 9fd5a470..15dd28d2 100644
--- a/server/setup/migrationsSqlite.ts
+++ b/server/setup/migrationsSqlite.ts
@@ -24,6 +24,7 @@ import m19 from "./scriptsSqlite/1.3.0";
 import m20 from "./scriptsSqlite/1.5.0";
 import m21 from "./scriptsSqlite/1.6.0";
 import m22 from "./scriptsSqlite/1.7.0";
+import m23 from "./scriptsSqlite/1.8.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -47,6 +48,7 @@ const migrations = [
     { version: "1.5.0", run: m20 },
     { version: "1.6.0", run: m21 },
     { version: "1.7.0", run: m22 },
+    { version: "1.8.0", run: m23 },
     // Add new migrations here as they are created
 ] as const;
 
diff --git a/server/setup/scriptsPg/1.8.0.ts b/server/setup/scriptsPg/1.8.0.ts
index 43b2a996..c1891c12 100644
--- a/server/setup/scriptsPg/1.8.0.ts
+++ b/server/setup/scriptsPg/1.8.0.ts
@@ -9,7 +9,14 @@ export default async function migration() {
     try {
         await db.execute(sql`
             BEGIN;
-            
+
+            ALTER TABLE "clients" ALTER COLUMN "bytesIn" SET DATA TYPE real;
+            ALTER TABLE "clients" ALTER COLUMN "bytesOut" SET DATA TYPE real;
+            ALTER TABLE "clientSession" ALTER COLUMN "expiresAt" SET DATA TYPE bigint;
+            ALTER TABLE "resources" ADD COLUMN "enableProxy" boolean DEFAULT true;
+            ALTER TABLE "sites" ADD COLUMN "remoteSubnets" text;
+            ALTER TABLE "user" ADD COLUMN "termsAcceptedTimestamp" varchar;
+            ALTER TABLE "user" ADD COLUMN "termsVersion" varchar;           
             
             COMMIT;
         `);