Skip to content

Commit d64d2e2

Browse files
HCK-9173: comment out inactive schema statement in script (#52)
* HCK-9173: comment out inactive schema statement in script * fix: comment out if isActivated is not FALSE * remove unused lib * fix undefined
1 parent 9ff3a58 commit d64d2e2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

forward_engineering/ddlProvider.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ module.exports = (baseProvider, options, app) => {
5353
functions,
5454
procedures,
5555
comment,
56+
isActivated = true,
5657
}) {
5758
let database;
5859
const schemaComment = assignTemplates(templates.comment, {
@@ -86,9 +87,10 @@ module.exports = (baseProvider, options, app) => {
8687
const userProcedures = procedures.map(procedure =>
8788
assignTemplates(templates.createProcedure, setOrReplace(procedure)),
8889
);
89-
return [database, comment ? _.trimStart(schemaComment) : '', ...userFunctions, ...userProcedures]
90+
const statement = [database, comment ? _.trimStart(schemaComment) : '', ...userFunctions, ...userProcedures]
9091
.filter(Boolean)
9192
.join('\n');
93+
return commentIfDeactivated(statement, { isActivated });
9294
},
9395

9496
createTable(tableData, isActivated) {
@@ -283,6 +285,7 @@ module.exports = (baseProvider, options, app) => {
283285
? procedures.map(hydrateProcedure(containerData.name)).filter(filterProcedure)
284286
: [],
285287
comment: containerData.description,
288+
isActivated: containerData.isActivated,
286289
};
287290
},
288291

forward_engineering/helpers/commentDeactivatedHelper.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
const _ = require('lodash');
2-
31
const commentIfDeactivated = (statement, data, isPartOfLine) => {
4-
if (_.has(data, 'isActivated') && !data.isActivated) {
2+
if (data.isActivated === false) {
53
if (isPartOfLine) {
64
return '/* ' + statement + ' */';
75
} else if (statement.includes('\n')) {

0 commit comments

Comments
 (0)