yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-08 16:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

use dropTableIfExists

Browse Source
This commit is contained in:
Pierre Noël 2021-03-29 10:11:19 +02:00
parent 2149493137
commit f3500ecea5
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/strapi-plugin-i18n/config/functions/migrations/__tests__/content-type.test.js
View File

@ -145,8 +145,7 @@ describe('i18n - Migration - enable/disable localization on a CT', () => {
const definition = { client: 'pg' };
const defaultLocaleRows = [{ value: '"fr"' }];
const deleteRelations = jest.fn();
const hasTable = jest.fn(() => Promise.resolve(true));
const dropTable = jest.fn();
const dropTableIfExists = jest.fn();
const table = jest.fn();
const model = { orm: 'bookshelf', deleteRelations };
const where = jest.fn(() => Promise.resolve(defaultLocaleRows));
@ -162,7 +161,7 @@ describe('i18n - Migration - enable/disable localization on a CT', () => {
trx.offset = jest.fn(() => trx);
trx.limit = jest.fn(() => Promise.resolve([{ id: 1 }, { id: 2 }]));
const transaction = jest.fn(() => Promise.resolve(trx));
const knex = { where, transaction, schema: { hasTable, dropTable, table } };
const knex = { where, transaction, schema: { dropTableIfExists, table } };
knex.select = jest.fn(() => knex);
knex.from = jest.fn(() => knex);
const ORM = { knex };
@ -177,7 +176,7 @@ describe('i18n - Migration - enable/disable localization on a CT', () => {
expect(transaction).toHaveBeenCalled();
expect(trx.commit).toHaveBeenCalled();
expect(table).toHaveBeenCalled();
expect(dropTable).toHaveBeenCalledWith('countries__localizations');
expect(dropTableIfExists).toHaveBeenCalledWith('countries__localizations');
});
test('i18n => non i18n - sqlite', async () => {
const previousDefinition = {
@ -187,8 +186,7 @@ describe('i18n - Migration - enable/disable localization on a CT', () => {
const definition = { client: 'sqlite3' };
const defaultLocaleRows = [{ value: '"fr"' }];
const deleteRelations = jest.fn();
const hasTable = jest.fn(() => Promise.resolve(true));
const dropTable = jest.fn();
const dropTableIfExists = jest.fn();
const table = jest.fn();
const model = { orm: 'bookshelf', deleteRelations };
const where = jest.fn(() => Promise.resolve(defaultLocaleRows));
@ -204,7 +202,7 @@ describe('i18n - Migration - enable/disable localization on a CT', () => {
trx.offset = jest.fn(() => trx);
trx.limit = jest.fn(() => Promise.resolve([{ id: 1 }, { id: 2 }]));
const transaction = jest.fn(() => Promise.resolve(trx));
const knex = { where, transaction, schema: { hasTable, dropTable, table } };
const knex = { where, transaction, schema: { dropTableIfExists, table } };
knex.select = jest.fn(() => knex);
knex.from = jest.fn(() => knex);
const ORM = { knex };
@ -221,7 +219,7 @@ describe('i18n - Migration - enable/disable localization on a CT', () => {
expect(trx.commit).toHaveBeenCalled();
expect(table).not.toHaveBeenCalled();
expect(context).toEqual({ recreateSqliteTable: true });
expect(dropTable).toHaveBeenCalledWith('countries__localizations');
expect(dropTableIfExists).toHaveBeenCalledWith('countries__localizations');
});
});
describe('mongoose', () => {

5
packages/strapi-plugin-i18n/config/functions/migrations/content-type/disable/migrate-for-bookshelf.js
View File

@ -52,10 +52,7 @@ const migrateForBookshelf = async (
});
}
const tableExists = await ORM.knex.schema.hasTable(localizationsTable);
if (tableExists) {
await ORM.knex.schema.dropTable(localizationsTable);
}
await ORM.knex.schema.dropTableIfExists(localizationsTable);
};
module.exports = migrateForBookshelf;