Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion forward_engineering/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,12 @@
"name": "Apply Drop Statements",
"isDropInStatements": true
}
]
],
"feLevelSelector": {
"entity": {
"separateBucket": true
},
"container": true,
"model": true
}
}
4 changes: 2 additions & 2 deletions forward_engineering/ddlProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = (baseProvider, options, app) => {
const { joinActivatedAndDeactivatedStatements } = require('./utils/statementJoiner');

return {
createDatabase({
createSchema({
databaseName,
friendlyName,
description,
Expand Down Expand Up @@ -305,7 +305,7 @@ module.exports = (baseProvider, options, app) => {
};
},

hydrateDatabase(containerData, data) {
hydrateSchema(containerData, data) {
const modelData = data?.modelData;

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand All @@ -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);
};
Expand Down
7 changes: 6 additions & 1 deletion localization/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}