From 9e151051a8e37753f5296e86f398ee9b0ae96a88 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sat, 13 Jan 2024 02:55:42 +0100 Subject: [PATCH 1/3] fix: Exit process after creating seed user --- packages/backend/bin/database/utils.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/backend/bin/database/utils.js b/packages/backend/bin/database/utils.js index 5e79c05d..51687120 100644 --- a/packages/backend/bin/database/utils.js +++ b/packages/backend/bin/database/utils.js @@ -4,6 +4,7 @@ import client from './client.js'; import User from '../../src/models/user.js'; import Role from '../../src/models/role.js'; import '../../src/config/orm.js'; +import process from 'process'; async function fetchAdminRole() { const role = await Role.query() @@ -46,6 +47,8 @@ export async function createUser( logger.info(`User already exists: ${email}`); } + + process.exit(0); } export const createDatabaseAndUser = async ( From 01ef97949b509f9afce8a9bf3ef3a7651e6ae1f2 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sat, 13 Jan 2024 02:58:28 +0100 Subject: [PATCH 2/3] feat: Convert migration file names if there is a table --- .../backend/bin/database/convert-migrations.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/backend/bin/database/convert-migrations.js b/packages/backend/bin/database/convert-migrations.js index e7d0243a..8334edc5 100644 --- a/packages/backend/bin/database/convert-migrations.js +++ b/packages/backend/bin/database/convert-migrations.js @@ -9,13 +9,18 @@ export const renameMigrationsAsJsFiles = async () => { } try { - await knex.raw( - `UPDATE knex_migrations SET name = REPLACE(name, '.ts', '.js') WHERE name LIKE '%.ts';` - ); + const tableExists = await knex.schema.hasTable('knex_migrations'); - logger.info( - `Migration file names with typescript renamed as JS file names!` - ); + if (tableExists) { + await knex('knex_migrations') + .where('name', 'like', '%.ts') + .update({ + name: knex.raw("REPLACE(name, '.ts', '.js')"), + }); + logger.info( + `Migration file names with typescript renamed as JS file names!` + ); + } } catch (err) { logger.error(err.message); } From 817db026b1f45d2c476977c8464da39828ee6deb Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sat, 13 Jan 2024 02:59:00 +0100 Subject: [PATCH 3/3] fix: Exit process after creating database and user --- packages/backend/bin/database/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/bin/database/utils.js b/packages/backend/bin/database/utils.js index 51687120..4d373353 100644 --- a/packages/backend/bin/database/utils.js +++ b/packages/backend/bin/database/utils.js @@ -61,6 +61,7 @@ export const createDatabaseAndUser = async ( await grantPrivileges(database, user); await client.end(); + process.exit(0); }; export const createDatabase = async (database = appConfig.postgresDatabase) => {