diff options
author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-02-03 22:39:10 +1100 |
---|---|---|
committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-02-03 22:39:10 +1100 |
commit | 6d8e6eca9deb59fd723a4e9f56234175755392a3 (patch) | |
tree | d864c05d24b95574a9b98d3845df0d9f15cf6dc9 | |
parent | Merge branch 'master' of github.com:fosscord/fosscord-server (diff) | |
download | server-6d8e6eca9deb59fd723a4e9f56234175755392a3.tar.xz |
On db sync/first run, add all the current migrations to migrations table to prevent running them on restarts
-rw-r--r-- | src/util/entities/Migration.ts | 4 | ||||
-rw-r--r-- | src/util/util/Database.ts | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/util/entities/Migration.ts b/src/util/entities/Migration.ts index e8351650..57097d8c 100644 --- a/src/util/entities/Migration.ts +++ b/src/util/entities/Migration.ts @@ -21,8 +21,8 @@ import { Entity, ObjectIdColumn, PrimaryGeneratedColumn, + BaseEntity, } from "typeorm"; -import { BaseClassWithoutId } from "./BaseClass"; export const PrimaryIdAutoGenerated = process.env.DATABASE?.startsWith( "mongodb", @@ -31,7 +31,7 @@ export const PrimaryIdAutoGenerated = process.env.DATABASE?.startsWith( : PrimaryGeneratedColumn; @Entity("migrations") -export class Migration extends BaseClassWithoutId { +export class Migration extends BaseEntity { @PrimaryIdAutoGenerated() id: number; diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 492fb4e4..d4509f67 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -18,6 +18,7 @@ import { DataSource } from "typeorm"; import { yellow, green, red } from "picocolors"; +import { Migration } from "../entities/Migration"; import { ConfigEntity } from "../entities/Config"; import { config } from "dotenv"; import path from "path"; @@ -107,6 +108,17 @@ export async function initDatabase(): Promise<DataSource> { "[Database] This appears to be a fresh database. Synchronising.", ); await dbConnection.synchronize(); + + // On next start, typeorm will try to run all the migrations again from beginning. + // Manually insert every current migration to prevent this: + await Promise.all( + dbConnection.migrations.map((migration) => + Migration.insert({ + name: migration.name, + timestamp: Date.now(), + }), + ), + ); } else { console.log("[Database] Applying missing migrations, if any."); await dbConnection.runMigrations(); |