diff --git a/assets/openapi.json b/assets/openapi.json index 26c330a54..7d506babe 100644 Binary files a/assets/openapi.json and b/assets/openapi.json differ diff --git a/assets/schemas.json b/assets/schemas.json index 89841e863..9f1d70fd6 100644 Binary files a/assets/schemas.json and b/assets/schemas.json differ diff --git a/src/database/Database.ts b/src/database/Database.ts index a1d394786..3fabc1795 100644 --- a/src/database/Database.ts +++ b/src/database/Database.ts @@ -16,13 +16,10 @@ along with this program. If not, see . */ -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 { // 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;