From f73cde6bb501d72e46f0aadf95e6809e9d265e5b Mon Sep 17 00:00:00 2001 From: Pitu Date: Fri, 25 Dec 2020 03:58:19 +0900 Subject: [PATCH] Chore: Move database to a subfolder for docker purposes --- src/api/databaseMigration.js | 2 +- src/api/structures/Route.js | 2 +- src/api/utils/Util.js | 2 +- src/setup.js | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/databaseMigration.js b/src/api/databaseMigration.js index 9afbb4a..73ec85c 100644 --- a/src/api/databaseMigration.js +++ b/src/api/databaseMigration.js @@ -62,7 +62,7 @@ const oldDb = require('knex')({ const newDb = require('knex')({ client: 'sqlite3', connection: { - filename: nodePath.join(__dirname, '../../', 'database.sqlite') + filename: nodePath.join(__dirname, '../../database/', 'database.sqlite') }, postProcessResponse: result => { const booleanFields = [ diff --git a/src/api/structures/Route.js b/src/api/structures/Route.js index 3806325..ff69e77 100644 --- a/src/api/structures/Route.js +++ b/src/api/structures/Route.js @@ -7,7 +7,7 @@ const db = require('knex')({ user: process.env.DB_USER, password: process.env.DB_PASSWORD, database: process.env.DB_DATABASE, - filename: nodePath.join(__dirname, '../../../database.sqlite') + filename: nodePath.join(__dirname, '../../../database/database.sqlite') }, postProcessResponse: result => { /* diff --git a/src/api/utils/Util.js b/src/api/utils/Util.js index 4279b6f..35d726e 100644 --- a/src/api/utils/Util.js +++ b/src/api/utils/Util.js @@ -10,7 +10,7 @@ const db = require('knex')({ user: process.env.DB_USER, password: process.env.DB_PASSWORD, database: process.env.DB_DATABASE, - filename: path.join(__dirname, '../../../database.sqlite') + filename: path.join(__dirname, '../../../database/database.sqlite') }, useNullAsDefault: process.env.DB_CLIENT === 'sqlite' }); diff --git a/src/setup.js b/src/setup.js index 5b0ba9b..def57f6 100644 --- a/src/setup.js +++ b/src/setup.js @@ -129,6 +129,7 @@ async function start() { envfile += `${item}=${allSettings[item]}\n`; } jetpack.write('.env', envfile); + jetpack.dir('database'); console.log(); console.log('=============================================');