diff --git a/forward_engineering/config.json b/forward_engineering/config.json index 1a8f6bf..a927b2e 100644 --- a/forward_engineering/config.json +++ b/forward_engineering/config.json @@ -47,5 +47,12 @@ "name": "Apply Drop Statements", "isDropInStatements": true } - ] + ], + "feLevelSelector": { + "entity": { + "separateBucket": true + }, + "container": true, + "model": true + } } diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js index f4720a6..f7427b2 100644 --- a/forward_engineering/ddlProvider.js +++ b/forward_engineering/ddlProvider.js @@ -32,7 +32,7 @@ module.exports = (baseProvider, options, app) => { const { joinActivatedAndDeactivatedStatements } = require('./utils/statementJoiner'); return { - createDatabase({ + createSchema({ databaseName, friendlyName, description, @@ -305,7 +305,7 @@ module.exports = (baseProvider, options, app) => { }; }, - hydrateDatabase(containerData, data) { + hydrateSchema(containerData, data) { const modelData = data?.modelData; return { diff --git a/forward_engineering/helpers/alterScriptHelpers/alterContainerHelper.js b/forward_engineering/helpers/alterScriptHelpers/alterContainerHelper.js index 68178e5..c3d85b1 100644 --- a/forward_engineering/helpers/alterScriptHelpers/alterContainerHelper.js +++ b/forward_engineering/helpers/alterScriptHelpers/alterContainerHelper.js @@ -7,9 +7,9 @@ module.exports = (app, options) => { const getAddContainerScript = modelData => containerData => { const constructedDbData = getDbData([containerData]); - const dbData = ddlProvider.hydrateDatabase(constructedDbData, { modelData }); + const dbData = ddlProvider.hydrateSchema(constructedDbData, { modelData }); - return _.trim(ddlProvider.createDatabase(dbData)); + return _.trim(ddlProvider.createSchema(dbData)); }; const getDeleteContainerScript = modelData => containerData => { @@ -36,7 +36,7 @@ module.exports = (app, options) => { } const constructedDbData = getDbData([containerData]); - const dbData = ddlProvider.hydrateDatabase(constructedDbData, { modelData }); + const dbData = ddlProvider.hydrateSchema(constructedDbData, { modelData }); return ddlProvider.alterDatabase(dbData); }; diff --git a/localization/en.json b/localization/en.json index 586a12d..3c8013f 100644 --- a/localization/en.json +++ b/localization/en.json @@ -170,5 +170,10 @@ "MODAL_WINDOW___OPTIONS_DISPLAY_ERD_V_ENTITY_BOX_CONTENT": "Display of table box content", "MODAL_WINDOW___OPTIONS_DISPLAY_ERD_V_FIELDS": "Columns", "MODAL_WINDOW___OPTIONS_DISPLAY_REQUIRED_ATTRIBUTES": "Required columns", - "MODAL_WINDOW___OPTIONS_DISPLAY_NULLABLE_ATTRIBUTES": "Nullable columns" + "MODAL_WINDOW___OPTIONS_DISPLAY_NULLABLE_ATTRIBUTES": "Nullable columns", + + "FE_LEVEL_SELECTOR_TITLE": "Level", + "FE_LEVEL_SELECTOR_CONTAINER": "Dataset", + "FE_LEVEL_SELECTOR_MODEL": "Model", + "FE_LEVEL_SELECTOR_ENTITY": "Table" }