BreizhHardware/Jellystat
1
0
Fork 0
mirror of https://github.com/BreizhHardware/Jellystat.git synced 2026-01-18 16:27:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160 from jsmouret/unstable

Browse Source 
Use POSTGRES_DATABASE environment variable
This commit is contained in:
Thegan Govender
2024-01-21 12:18:17 +02:00
committed by GitHub
parent 018a90424e 4a236d3fbc
commit 86c3853553
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/create_database.js
View File

@@ -4,6 +4,7 @@ const _POSTGRES_USER = process.env.POSTGRES_USER;
const _POSTGRES_PASSWORD = process.env.POSTGRES_PASSWORD;
const _POSTGRES_IP = process.env.POSTGRES_IP;
const _POSTGRES_PORT = process.env.POSTGRES_PORT;
const _POSTGRES_DATABASE = process.env.POSTGRES_DATABASE || 'jfstat';
const client = new Client({
host: _POSTGRES_IP,
@@ -15,7 +16,7 @@ const client = new Client({
const createDatabase = async () => {
try {
await client.connect(); // gets connection
await client.query('CREATE DATABASE jfstat'); // sends queries
await client.query('CREATE DATABASE ' + _POSTGRES_DATABASE); // sends queries
return true;
} catch (error) {
if (!error.stack.includes('already exists')) {

5
backend/db.js
View File

@@ -8,6 +8,7 @@ const _POSTGRES_USER = process.env.POSTGRES_USER;
const _POSTGRES_PASSWORD = process.env.POSTGRES_PASSWORD;
const _POSTGRES_IP = process.env.POSTGRES_IP;
const _POSTGRES_PORT = process.env.POSTGRES_PORT;
const _POSTGRES_DATABASE = process.env.POSTGRES_DATABASE || 'jfstat';
if (
[_POSTGRES_USER, _POSTGRES_PASSWORD, _POSTGRES_IP, _POSTGRES_PORT].includes(
@@ -21,7 +22,7 @@ if (
const pool = new Pool({
user: _POSTGRES_USER,
host: _POSTGRES_IP,
database: 'jfstat',
database: _POSTGRES_DATABASE,
password: _POSTGRES_PASSWORD,
port: _POSTGRES_PORT,
});
@@ -156,7 +157,7 @@ async function query(text, params) {
);
} else {
if(error.message && !error.message.contains('database "jfstat" does not exist'))
if(error.message && !error.message.contains('database "' + _POSTGRES_DATABASE + '" does not exist'))
{
console.error('Error occurred while executing query:', error.message);
}

4
backend/migrations.js
View File

@@ -7,7 +7,7 @@ module.exports = {
user: process.env.POSTGRES_USER,
password: process.env.POSTGRES_PASSWORD,
port:process.env.POSTGRES_PORT,
database: 'jfstat',
database: process.env.POSTGRES_DATABASE || 'jfstat',
createDatabase: true,
},
migrations: {
@@ -34,7 +34,7 @@ module.exports = {
user: process.env.DB_USER,
password: process.env.DB_PASSWORD,
port:process.env.POSTGRES_PORT,
database: "jfstat",
database: process.env.POSTGRES_DATABASE || 'jfstat',
createDatabase: true,
},
migrations: {