TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-29 13:52:10 +03:00
Code Issues Projects Releases Wiki Activity

Fixed error handling on db truncate in tests

Browse Source 
- if the database does not exist, ignore the error
   - tables that don't exist don't need truncating
   - instead wait until the next thing calls init, that will cause a fresh db to be created in the correct state
- inside of reset, if the truncate fails then do a full reset instead
This commit is contained in:
Hannah Wolfe 2022-03-17 09:04:57 +00:00
parent 83ad79308b
commit b90e367563
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/utils/db-utils.js
View File

@ -47,10 +47,15 @@ module.exports.reset = async ({truncate} = {truncate: false}) => {
}
} else {
if (truncate) {
// Perform a fast reset by tearing down all the tables and
// inserting the fixtures
await module.exports.teardown();
await knexMigrator.init({only: 2});
// Perform a fast reset by tearing down all the tables and inserting the fixtures
try {
await module.exports.teardown();
await knexMigrator.init({only: 2});
} catch (err) {
// If it fails, try a normal restore
await knexMigrator.reset({force: true});
await knexMigrator.init();
}
} else {
// Do a full database reset + initialisation
await knexMigrator.reset({force: true});
@ -140,12 +145,25 @@ module.exports.teardown = () => {
return db.knex.raw('SET FOREIGN_KEY_CHECKS=1;').transacting(trx);
})
.catch(function (err) {
// CASE: table does not exist
if (err.errno === 1146) {
// CASE: table does not exist || DB does not exist
// If the table or DB are not present, we can safely ignore
if (err.errno === 1146 || err.errno === 1049) {
return Promise.resolve();
}
throw err;
})
.finally(() => {
debug('Database teardown end');
});
});
})
.catch(function (err) {
// CASE: table does not exist || DB does not exist
// If the table or DB are not present, we can safely ignore
if (err.errno === 1146 || err.errno === 1049) {
return Promise.resolve();
}
throw err;
});
};