summary refs log tree commit diff
path: root/src/database/Database.ts
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2026-06-11 22:50:56 +0200
committerRory& <root@rory.gay>2026-06-12 17:58:18 +0200
commit0b5d2a576d847087afa49df28784a1889da5354b (patch)
tree0197b7cddbcec77527de69d0980897a930cd390f /src/database/Database.ts
parentMove entities to database (diff)
downloadserver-ts-0b5d2a576d847087afa49df28784a1889da5354b.tar.xz
Fix recursive import in database
Diffstat (limited to 'src/database/Database.ts')
-rw-r--r--src/database/Database.ts10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/database/Database.ts b/src/database/Database.ts

index a1d39478..3fabc179 100644 --- a/src/database/Database.ts +++ b/src/database/Database.ts
@@ -16,13 +16,10 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ -import { config } from "dotenv"; import path from "node:path"; +import fs from "node:fs"; import { green, red, yellow } from "picocolors"; import { DataSource } from "typeorm"; -// noinspection ES6PreferShortImport -import { ConfigEntity } from "@spacebar/database/entities/Config"; -import fs from "node:fs"; import { ProcessLifecycle } from "../util/util/ProcessLifecycle"; // UUID extension option is only supported with postgres @@ -34,7 +31,7 @@ let isHeadlessProcess = false; // For typeorm cli if (!process.env) { isHeadlessProcess = true; - config({ quiet: true }); + require("dotenv").config({ quiet: true }); } if (process.argv[1]?.endsWith("scripts/openapi.js")) isHeadlessProcess = true; @@ -100,7 +97,8 @@ export async function initDatabase(): Promise<DataSource> { // Crude way of detecting if the migrations table exists. const dbExists = async () => { try { - await ConfigEntity.count(); + // do not globally import to avoid circular references + await require("./entities/Config").ConfigEntity.count(); return true; } catch (e) { return false;