fix: always require db-user and password for mysql (#1730)

This commit is contained in:
Meier Lukas
2024-12-19 17:48:10 +01:00
committed by GitHub
parent 8c1156240c
commit d2584b63c5
10 changed files with 110 additions and 71 deletions

View File

@@ -7,6 +7,7 @@ import mysql from "mysql2";
import { logger } from "@homarr/log";
import { env } from "./env.mjs";
import * as mysqlSchema from "./schema/mysql";
import * as sqliteSchema from "./schema/sqlite";
@@ -15,7 +16,7 @@ type HomarrDatabase = BetterSQLite3Database<typeof sqliteSchema>;
const init = () => {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!connection) {
switch (process.env.DB_DRIVER) {
switch (env.DB_DRIVER) {
case "mysql2":
initMySQL2();
break;
@@ -36,7 +37,7 @@ class WinstonDrizzleLogger implements Logger {
}
const initBetterSqlite = () => {
connection = new Database(process.env.DB_URL);
connection = new Database(env.DB_URL);
database = drizzleSqlite(connection, {
schema: sqliteSchema,
logger: new WinstonDrizzleLogger(),
@@ -45,16 +46,15 @@ const initBetterSqlite = () => {
};
const initMySQL2 = () => {
if (!process.env.DB_HOST) {
connection = mysql.createConnection({ uri: process.env.DB_URL });
if (!env.DB_HOST) {
connection = mysql.createConnection({ uri: env.DB_URL });
} else {
connection = mysql.createConnection({
host: process.env.DB_HOST,
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
database: process.env.DB_NAME!,
port: Number(process.env.DB_PORT),
user: process.env.DB_USER,
password: process.env.DB_PASSWORD,
host: env.DB_HOST,
database: env.DB_NAME,
port: env.DB_PORT,
user: env.DB_USER,
password: env.DB_PASSWORD,
});
}