From 15753647366fb28fa62f586c5fee007fd8c8b8a5 Mon Sep 17 00:00:00 2001 From: Chareice Date: Wed, 15 Feb 2023 00:18:41 +0800 Subject: [PATCH] chore: test --- packages/core/database/src/collection.ts | 4 ++++ packages/plugins/duplicator/src/server/__tests__/dump.test.ts | 2 +- packages/plugins/duplicator/src/server/dumper.ts | 2 +- .../ui-schema-storage/src/__tests__/ui-schema-model.test.ts | 4 +--- .../src/__tests__/ui-schema-repository-with-cache.test.ts | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/core/database/src/collection.ts b/packages/core/database/src/collection.ts index 8908def2d..c4898c506 100644 --- a/packages/core/database/src/collection.ts +++ b/packages/core/database/src/collection.ts @@ -542,4 +542,8 @@ export class Collection< return tableName; } + + public quotedTableName() { + return this.db.utils.quoteTable(this.addSchemaTableName()); + } } diff --git a/packages/plugins/duplicator/src/server/__tests__/dump.test.ts b/packages/plugins/duplicator/src/server/__tests__/dump.test.ts index cb532bdb2..c344f3981 100644 --- a/packages/plugins/duplicator/src/server/__tests__/dump.test.ts +++ b/packages/plugins/duplicator/src/server/__tests__/dump.test.ts @@ -19,6 +19,7 @@ describe('dump', () => { app = mockServer(); db = app.db; + await app.cleanDb(); app.db.collection({ name: 'users', @@ -52,7 +53,6 @@ describe('dump', () => { fields: [], }); - await app.cleanDb(); await db.sync(); }); diff --git a/packages/plugins/duplicator/src/server/dumper.ts b/packages/plugins/duplicator/src/server/dumper.ts index 7762d142b..f820852a4 100644 --- a/packages/plugins/duplicator/src/server/dumper.ts +++ b/packages/plugins/duplicator/src/server/dumper.ts @@ -177,7 +177,7 @@ ORDER BY table_schema, table_name`, const dataStream = fs.createWriteStream(dataFilePath); const rows = await app.db.sequelize.query( - sqlAdapter(app.db, `SELECT * FROM ${collection.isParent() ? 'ONLY' : ''} "${collection.model.tableName}"`), + sqlAdapter(app.db, `SELECT * FROM ${collection.isParent() ? 'ONLY' : ''} ${collection.quotedTableName()}`), { type: 'SELECT', }, diff --git a/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-model.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-model.test.ts index 8f6e6fc51..0ddf01011 100644 --- a/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-model.test.ts +++ b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-model.test.ts @@ -19,9 +19,7 @@ describe('ui schema model', () => { db = app.db; - const queryInterface = db.sequelize.getQueryInterface(); - await queryInterface.dropAllTables(); - + await db.clean({ drop: true }); app.plugin(PluginUiSchema, { name: 'ui-schema-storage' }); await app.load(); diff --git a/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-repository-with-cache.test.ts b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-repository-with-cache.test.ts index cfb3860d6..86b44cc97 100644 --- a/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-repository-with-cache.test.ts +++ b/packages/plugins/ui-schema-storage/src/__tests__/ui-schema-repository-with-cache.test.ts @@ -23,7 +23,7 @@ describe('ui_schema repository with cache', () => { db = app.db; cache = app.cache; - await db.sequelize.getQueryInterface().dropAllTables(); + await db.clean({ drop: true }); app.plugin(PluginUiSchema, { name: 'ui-schema-storage' });