From 4dcf684868418650ad72ba7833c61d89a49eb85d Mon Sep 17 00:00:00 2001 From: miloschwartz Date: Tue, 7 Jul 2026 16:04:41 -0400 Subject: [PATCH] add 1.20.0 migration --- server/setup/migrationsPg.ts | 4 +- server/setup/migrationsSqlite.ts | 4 +- server/setup/scriptsPg/1.20.0.ts | 104 ++++++++++++++++++ .../scriptsSqlite/{1.19.5.ts => 1.20.0.ts} | 60 +++++++++- 4 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 server/setup/scriptsPg/1.20.0.ts rename server/setup/scriptsSqlite/{1.19.5.ts => 1.20.0.ts} (65%) diff --git a/server/setup/migrationsPg.ts b/server/setup/migrationsPg.ts index 0be22d492..a271ef96d 100644 --- a/server/setup/migrationsPg.ts +++ b/server/setup/migrationsPg.ts @@ -26,6 +26,7 @@ import m17 from "./scriptsPg/1.18.0"; import m18 from "./scriptsPg/1.18.3"; import m19 from "./scriptsPg/1.18.4"; import m20 from "./scriptsPg/1.19.0"; +import m21 from "./scriptsPg/1.20.0"; // THIS CANNOT IMPORT ANYTHING FROM THE SERVER // EXCEPT FOR THE DATABASE AND THE SCHEMA @@ -51,7 +52,8 @@ const migrations = [ { version: "1.18.0", run: m17 }, { version: "1.18.3", run: m18 }, { version: "1.18.4", run: m19 }, - { version: "1.19.0", run: m20 } + { version: "1.19.0", run: m20 }, + { version: "1.20.0", run: m21 } // Add new migrations here as they are created ] as { version: string; diff --git a/server/setup/migrationsSqlite.ts b/server/setup/migrationsSqlite.ts index 8662678d2..a8f6f9e33 100644 --- a/server/setup/migrationsSqlite.ts +++ b/server/setup/migrationsSqlite.ts @@ -45,7 +45,7 @@ import m39 from "./scriptsSqlite/1.18.3"; import m40 from "./scriptsSqlite/1.18.4"; import m41 from "./scriptsSqlite/1.19.0"; import m42 from "./scriptsSqlite/1.19.1"; -import m43 from "./scriptsSqlite/1.19.5"; +import m43 from "./scriptsSqlite/1.20.0"; // THIS CANNOT IMPORT ANYTHING FROM THE SERVER // EXCEPT FOR THE DATABASE AND THE SCHEMA @@ -89,7 +89,7 @@ const migrations = [ { version: "1.18.4", run: m40 }, { version: "1.19.0", run: m41 }, { version: "1.19.1", run: m42 }, - { version: "1.19.5", run: m43 } + { version: "1.20.0", run: m43 } // Add new migrations here as they are created ] as const; diff --git a/server/setup/scriptsPg/1.20.0.ts b/server/setup/scriptsPg/1.20.0.ts new file mode 100644 index 000000000..2a23e73a0 --- /dev/null +++ b/server/setup/scriptsPg/1.20.0.ts @@ -0,0 +1,104 @@ +import { db } from "@server/db/pg/driver"; +import { sql } from "drizzle-orm"; + +const version = "1.20.0"; + +export default async function migration() { + console.log(`Running setup script ${version}...`); + + try { + await db.execute(sql`BEGIN`); + + await db.execute(sql` + CREATE TABLE "remoteExitNodePreferenceLabels" ( + "remoteExitNodePreferenceLabelId" serial PRIMARY KEY NOT NULL, + "remoteExitNodeId" varchar NOT NULL, + "labelId" integer NOT NULL, + CONSTRAINT "remote_exit_node_preference_label_uniq" UNIQUE("remoteExitNodeId","labelId") + ); + `); + + await db.execute(sql` + CREATE TABLE "remoteExitNodeResources" ( + "remoteExitNodeResourceId" serial PRIMARY KEY NOT NULL, + "remoteExitNodeId" varchar NOT NULL, + "destination" varchar NOT NULL + ); + `); + + await db.execute(sql` + CREATE TABLE "launcherViews" ( + "viewId" serial PRIMARY KEY NOT NULL, + "orgId" varchar NOT NULL, + "userId" varchar, + "name" varchar NOT NULL, + "config" text NOT NULL, + "isDefault" boolean DEFAULT false NOT NULL, + "createdAt" varchar NOT NULL, + "updatedAt" varchar NOT NULL + ); + `); + + await db.execute( + sql`ALTER TABLE "domains" ADD COLUMN "lastCheckedAt" integer;` + ); + + await db.execute(sql` + ALTER TABLE "remoteExitNodePreferenceLabels" ADD CONSTRAINT "remoteExitNodePreferenceLabels_remoteExitNodeId_remoteExitNode_id_fk" FOREIGN KEY ("remoteExitNodeId") REFERENCES "public"."remoteExitNode"("id") ON DELETE cascade ON UPDATE no action; + `); + + await db.execute(sql` + ALTER TABLE "remoteExitNodePreferenceLabels" ADD CONSTRAINT "remoteExitNodePreferenceLabels_labelId_labels_labelId_fk" FOREIGN KEY ("labelId") REFERENCES "public"."labels"("labelId") ON DELETE cascade ON UPDATE no action; + `); + + await db.execute(sql` + ALTER TABLE "remoteExitNodeResources" ADD CONSTRAINT "remoteExitNodeResources_remoteExitNodeId_remoteExitNode_id_fk" FOREIGN KEY ("remoteExitNodeId") REFERENCES "public"."remoteExitNode"("id") ON DELETE cascade ON UPDATE no action; + `); + + await db.execute(sql` + ALTER TABLE "launcherViews" ADD CONSTRAINT "launcherViews_orgId_orgs_orgId_fk" FOREIGN KEY ("orgId") REFERENCES "public"."orgs"("orgId") ON DELETE cascade ON UPDATE no action; + `); + + await db.execute(sql` + ALTER TABLE "launcherViews" ADD CONSTRAINT "launcherViews_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action; + `); + + await db.execute(sql` + CREATE INDEX "idx_clients_orgid_niceid" ON "clients" USING btree ("orgId","niceId"); + `); + + await db.execute(sql` + CREATE INDEX "idx_networks_orgid" ON "networks" USING btree ("orgId"); + `); + + await db.execute(sql` + CREATE INDEX "idx_resourcepolicies_orgid_niceid" ON "resourcePolicies" USING btree ("orgId","niceId"); + `); + + await db.execute(sql` + CREATE INDEX "idx_resources_niceid" ON "resources" USING btree ("niceId"); + `); + + await db.execute(sql` + CREATE INDEX "idx_resources_orgid_niceid" ON "resources" USING btree ("orgId","niceId"); + `); + + await db.execute(sql` + CREATE INDEX "idx_siteresources_orgid_niceid" ON "siteResources" USING btree ("orgId","niceId"); + `); + + await db.execute(sql` + CREATE INDEX "idx_sites_orgid_niceid" ON "sites" USING btree ("orgId","niceId"); + `); + + await db.execute(sql`COMMIT`); + console.log("Migrated database"); + } catch (e) { + await db.execute(sql`ROLLBACK`); + console.log("Unable to migrate database"); + console.log(e); + throw e; + } + + console.log(`${version} migration complete`); +} diff --git a/server/setup/scriptsSqlite/1.19.5.ts b/server/setup/scriptsSqlite/1.20.0.ts similarity index 65% rename from server/setup/scriptsSqlite/1.19.5.ts rename to server/setup/scriptsSqlite/1.20.0.ts index b9fe43ecf..186e2fc5f 100644 --- a/server/setup/scriptsSqlite/1.19.5.ts +++ b/server/setup/scriptsSqlite/1.20.0.ts @@ -2,7 +2,7 @@ import { APP_PATH } from "@server/lib/consts"; import Database from "better-sqlite3"; import path from "path"; -const version = "1.19.5"; +const version = "1.20.0"; export default async function migration() { console.log(`Running setup script ${version}...`); @@ -92,6 +92,64 @@ export default async function migration() { db.prepare( `ALTER TABLE 'resourceSessions_new' RENAME TO 'resourceSessions';` ).run(); + + db.prepare( + ` + CREATE TABLE 'remoteExitNodePreferenceLabels' ( + 'remoteExitNodePreferenceLabelId' integer PRIMARY KEY AUTOINCREMENT NOT NULL, + 'remoteExitNodeId' text NOT NULL, + 'labelId' integer NOT NULL, + FOREIGN KEY ('remoteExitNodeId') REFERENCES 'remoteExitNode'('id') ON UPDATE no action ON DELETE cascade, + FOREIGN KEY ('labelId') REFERENCES 'labels'('labelId') ON UPDATE no action ON DELETE cascade + ); + ` + ).run(); + + db.prepare( + ` + CREATE UNIQUE INDEX 'remote_exit_node_preference_label_uniq' ON 'remoteExitNodePreferenceLabels' ('remoteExitNodeId','labelId'); + ` + ).run(); + + db.prepare( + ` + CREATE TABLE 'remoteExitNodeResources' ( + 'remoteExitNodeResourceId' integer PRIMARY KEY AUTOINCREMENT NOT NULL, + 'remoteExitNodeId' text NOT NULL, + 'destination' text NOT NULL, + FOREIGN KEY ('remoteExitNodeId') REFERENCES 'remoteExitNode'('id') ON UPDATE no action ON DELETE cascade + ); + ` + ).run(); + + db.prepare( + ` + CREATE TABLE 'launcherViews' ( + 'viewId' integer PRIMARY KEY AUTOINCREMENT NOT NULL, + 'orgId' text NOT NULL, + 'userId' text, + 'name' text NOT NULL, + 'config' text NOT NULL, + 'isDefault' integer DEFAULT false NOT NULL, + 'createdAt' text NOT NULL, + 'updatedAt' text NOT NULL, + FOREIGN KEY ('orgId') REFERENCES 'orgs'('orgId') ON UPDATE no action ON DELETE cascade, + FOREIGN KEY ('userId') REFERENCES 'user'('id') ON UPDATE no action ON DELETE cascade + ); + ` + ).run(); + + db.prepare( + ` + ALTER TABLE 'domains' ADD 'customCertResolver' text; + ` + ).run(); + + db.prepare( + ` + ALTER TABLE 'domains' ADD 'lastCheckedAt' integer; + ` + ).run(); })(); db.pragma("foreign_keys = ON");