add 1.21 migrations

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.20.0";
+export const APP_VERSION = "1.21.0";
 
 export const __FILENAME = fileURLToPath(import.meta.url);
 export const __DIRNAME = path.dirname(__FILENAME);

server/setup/migrationsPg.ts

@@ -27,6 +27,7 @@ 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";
+import m22 from "./scriptsPg/1.21.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -53,7 +54,8 @@ const migrations = [
     { version: "1.18.3", run: m18 },
     { version: "1.18.4", run: m19 },
     { version: "1.19.0", run: m20 },
-    { version: "1.20.0", run: m21 }
+    { version: "1.20.0", run: m21 },
+    { version: "1.21.0", run: m22 }
     // Add new migrations here as they are created
 ] as {
     version: string;

server/setup/migrationsSqlite.ts

@@ -46,6 +46,7 @@ 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.20.0";
+import m44 from "./scriptsSqlite/1.21.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -89,7 +90,8 @@ const migrations = [
     { version: "1.18.4", run: m40 },
     { version: "1.19.0", run: m41 },
     { version: "1.19.1", run: m42 },
-    { version: "1.20.0", run: m43 }
+    { version: "1.20.0", run: m43 },
+    { version: "1.21.0", run: m44 }
     // Add new migrations here as they are created
 ] as const;
 

server/setup/scriptsPg/1.21.0.ts

@@ -0,0 +1,46 @@
+import { db } from "@server/db/pg/driver";
+import { sql } from "drizzle-orm";
+
+const version = "1.21.0";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    try {
+        await db.execute(sql`BEGIN`);
+
+        await db.execute(sql`
+            ALTER TABLE "resourceAccessToken" ADD COLUMN "userId" varchar;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "resourceAccessToken" ADD COLUMN "persistSession" boolean DEFAULT false NOT NULL;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "resources" ADD COLUMN "status" varchar DEFAULT 'approved';
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "siteResources" ADD COLUMN "status" varchar DEFAULT 'approved';
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "sites" ADD COLUMN "localEndpoints" varchar;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "resourceAccessToken" ADD CONSTRAINT "resourceAccessToken_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
+        `);
+
+        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`);
+}

server/setup/scriptsSqlite/1.21.0.ts

@@ -0,0 +1,57 @@
+import { APP_PATH } from "@server/lib/consts";
+import Database from "better-sqlite3";
+import path from "path";
+
+const version = "1.21.0";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    const location = path.join(APP_PATH, "db", "db.sqlite");
+    const db = new Database(location);
+
+    try {
+        db.pragma("foreign_keys = OFF");
+
+        db.transaction(() => {
+            db.prepare(
+                `
+            ALTER TABLE 'resourceAccessToken' ADD 'userId' text REFERENCES user(id);
+                `
+            ).run();
+
+            db.prepare(
+                `
+            ALTER TABLE 'resourceAccessToken' ADD 'persistSession' integer DEFAULT false NOT NULL;
+                `
+            ).run();
+
+            db.prepare(
+                `
+            ALTER TABLE 'resources' ADD 'status' text DEFAULT 'approved';
+                `
+            ).run();
+
+            db.prepare(
+                `
+            ALTER TABLE 'siteResources' ADD 'status' text DEFAULT 'approved';
+                `
+            ).run();
+
+            db.prepare(
+                `
+            ALTER TABLE 'sites' ADD 'localEndpoints' text;
+                `
+            ).run();
+        })();
+
+        db.pragma("foreign_keys = ON");
+
+        console.log("Migrated database");
+    } catch (e) {
+        console.log("Failed to migrate db:", e);
+        throw e;
+    }
+
+    console.log(`${version} migration complete`);
+}