groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

honor schema from env

Browse Source
This commit is contained in:
Shehab Ghazy
2023-04-07 18:35:16 +03:00
committed by Faruk AYDIN
parent 270039d211
commit 47212c37c2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/backend/knexfile.ts
View File

@@ -7,11 +7,12 @@ const knexConfig = {
connection: { connection: {
host: appConfig.postgresHost, host: appConfig.postgresHost,
port: appConfig.postgresPort, port: appConfig.postgresPort,
user: appConfig.postgresUsername, user: 'postgres' || appConfig.postgresUsername,
password: appConfig.postgresPassword, password: '@Sql2023' || appConfig.postgresPassword,
database: appConfig.postgresDatabase, database: appConfig.postgresDatabase,
ssl: appConfig.postgresEnableSsl, ssl: appConfig.postgresEnableSsl,
}, },
searchPath: [appConfig.databaseSchema],
pool: { min: 0, max: 20 }, pool: { min: 0, max: 20 },
migrations: { migrations: {
directory: __dirname + '/src/db/migrations', directory: __dirname + '/src/db/migrations',

2
packages/backend/src/config/app.ts
View File

@@ -11,6 +11,7 @@ type AppConfig = {
appEnv: string; appEnv: string;
isDev: boolean; isDev: boolean;
postgresDatabase: string; postgresDatabase: string;
databaseSchema: string;
postgresPort: number; postgresPort: number;
postgresHost: string; postgresHost: string;
postgresUsername: string; postgresUsername: string;
@@ -81,6 +82,7 @@ const appConfig: AppConfig = {
isDev: appEnv === 'development', isDev: appEnv === 'development',
version: process.env.npm_package_version, version: process.env.npm_package_version,
postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development', postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development',
databaseSchema: process.env.DATABASE_SCHEMA || 'public',
postgresPort: parseInt(process.env.POSTGRES_PORT || '5432'), postgresPort: parseInt(process.env.POSTGRES_PORT || '5432'),
postgresHost: process.env.POSTGRES_HOST || 'localhost', postgresHost: process.env.POSTGRES_HOST || 'localhost',
postgresUsername: postgresUsername: