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
hackolade · Dec 19, 2024 · d64d2e2 · d64d2e2
1 parent 9ff3a58
commit d64d2e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -53,6 +53,7 @@ module.exports = (baseProvider, options, app) => {
 			functions,
 			procedures,
 			comment,
+			isActivated = true,
 		}) {
 			let database;
 			const schemaComment = assignTemplates(templates.comment, {
@@ -86,9 +87,10 @@ module.exports = (baseProvider, options, app) => {
 			const userProcedures = procedures.map(procedure =>
 				assignTemplates(templates.createProcedure, setOrReplace(procedure)),
 			);
-			return [database, comment ? _.trimStart(schemaComment) : '', ...userFunctions, ...userProcedures]
+			const statement = [database, comment ? _.trimStart(schemaComment) : '', ...userFunctions, ...userProcedures]
 				.filter(Boolean)
 				.join('\n');
+			return commentIfDeactivated(statement, { isActivated });
 		},
 
 		createTable(tableData, isActivated) {
@@ -283,6 +285,7 @@ module.exports = (baseProvider, options, app) => {
 					? procedures.map(hydrateProcedure(containerData.name)).filter(filterProcedure)
 					: [],
 				comment: containerData.description,
+				isActivated: containerData.isActivated,
 			};
 		},
 

diff --git a/forward_engineering/helpers/commentDeactivatedHelper.js b/forward_engineering/helpers/commentDeactivatedHelper.js
@@ -1,7 +1,5 @@
-const _ = require('lodash');
-
 const commentIfDeactivated = (statement, data, isPartOfLine) => {
-	if (_.has(data, 'isActivated') && !data.isActivated) {
+	if (data.isActivated === false) {
 		if (isPartOfLine) {
 			return '/* ' + statement + ' */';
 		} else if (statement.includes('\n')) {