From b6d9bc4a8e9b70e4dea825499098f6e6a5f0e0bb Mon Sep 17 00:00:00 2001 From: "Christopher S. Case" Date: Sun, 19 May 2024 21:39:59 -0500 Subject: [PATCH] More fixes for migration and seeds. --- .../migrations/20240519053307_hash_primary_key.ts | 12 ++++-------- src/server/knex/seeds/admin_role.ts | 13 ++----------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/server/knex/migrations/20240519053307_hash_primary_key.ts b/src/server/knex/migrations/20240519053307_hash_primary_key.ts index 0963136..ec8e88f 100644 --- a/src/server/knex/migrations/20240519053307_hash_primary_key.ts +++ b/src/server/knex/migrations/20240519053307_hash_primary_key.ts @@ -243,15 +243,13 @@ export async function up(knex : Knex) : Promise // Step 5: Re-add Indexes //------------------------------------------------------------------------------------------------------------------ - knex.schema.table('account', (table) => + await knex.schema.table('account', (table) => { - table.dropUnique([ 'email' ]); table.unique('email'); }); - knex.schema.table('account_role', (table) => + await knex.schema.table('account_role', (table) => { - table.dropIndex([ 'account_id', 'role_id' ]); table.unique([ 'account_id', 'role_id' ]); }); } @@ -505,15 +503,13 @@ export async function down(knex : Knex) : Promise // Step 5: Re-add Indexes //------------------------------------------------------------------------------------------------------------------ - knex.schema.table('account', (table) => + await knex.schema.table('account', (table) => { - table.dropUnique([ 'email' ]); table.unique('email'); }); - knex.schema.table('account_role', (table) => + await knex.schema.table('account_role', (table) => { - table.dropIndex([ 'account_id', 'role_id' ]); table.unique([ 'account_id', 'role_id' ]); }); } diff --git a/src/server/knex/seeds/admin_role.ts b/src/server/knex/seeds/admin_role.ts index a74d468..25f5024 100644 --- a/src/server/knex/seeds/admin_role.ts +++ b/src/server/knex/seeds/admin_role.ts @@ -25,15 +25,6 @@ exports.seed = async(knex) => permissions: '["*/*"]', settings: '{}', created: knex.fn.now() - }, - { - account_id: '3VzoXi', - email: 'null23544@gmail.com', - name: 'Lord Null', - avatar: 'https://lh6.googleusercontent.com/-uCa4jsA-_i0/AAAAAAAAAAI/AAAAAAAAAB4/chnr3xPv3_c/s96-c/photo.jpg?sz=512', - permissions: '[]', - settings: '{}', - created: knex.fn.now() } ]; @@ -55,7 +46,7 @@ exports.seed = async(knex) => for(const account of admins) { const exists = (await knex('account').select() - .where({ account_id: account.account_id })).length > 0; + .where({ email: account.email })).length > 0; if(!exists) { await knex('account').insert(account); @@ -73,7 +64,7 @@ exports.seed = async(knex) => for(const account of mods) { const exists = (await knex('account').select() - .where({ account_id: account.account_id })).length > 0; + .where({ email: account.email })).length > 0; if(!exists) { await knex('account').insert(account);