HCK-9173: comment out inactive schema statement in script (#125)

* HCK-9173: comment out inactive schema statement in script * fix: comment out if isActivated is not FALSE * fix undefined
hackolade · Dec 19, 2024 · 84708a9 · 84708a9
1 parent 536c12e
commit 84708a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -45,7 +45,7 @@ module.exports = (baseProvider, options, app) => {
 	const terminator = getTerminator(options);
 
 	return {
-		createSchema({ schemaName, databaseName, ifNotExist, comment }) {
+		createSchema({ schemaName, databaseName, ifNotExist, comment, isActivated = true }) {
 			const schemaTerminator = ifNotExist ? ';' : terminator;
 
 			const schemaComment = comment
@@ -56,11 +56,14 @@ module.exports = (baseProvider, options, app) => {
 					})
 				: '';
 
-			let schemaStatement = assignTemplates(templates.createSchema, {
-				name: schemaName,
-				terminator: schemaTerminator,
-				comment: schemaComment ? `\n\n${schemaComment}` : '',
-			});
+			let schemaStatement = commentIfDeactivated(
+				assignTemplates(templates.createSchema, {
+					name: schemaName,
+					terminator: schemaTerminator,
+					comment: schemaComment ? `\n\n${schemaComment}` : '',
+				}),
+				{ isActivated },
+			);
 
 			if (!databaseName) {
 				return ifNotExist
@@ -500,6 +503,7 @@ module.exports = (baseProvider, options, app) => {
 				databaseName: containerData.databaseName,
 				ifNotExist: containerData.ifNotExist,
 				comment: containerData.role?.description ?? containerData.description,
+				isActivated: containerData.isActivated,
 			};
 		},
 

diff --git a/forward_engineering/helpers/commentIfDeactivated.js b/forward_engineering/helpers/commentIfDeactivated.js
@@ -2,7 +2,7 @@ const BEFORE_DEACTIVATED_STATEMENT = '-- ';
 const REG_FOR_MULTYLINE_COMMENT = /(\n\/\*\n[\s\S]*?\n\s\*\/\n)|((\n\/\*\n[\s\S]*?\n\s\*\/)$)/gi;
 
 const commentIfDeactivated = (statement, data, isPartOfLine) => {
-	if (data?.hasOwnProperty('isActivated') && !data.isActivated) {
+	if (data.isActivated === false) {
 		if (isPartOfLine) {
 			return '/* ' + statement + ' */';
 		} else if (statement.includes('\n')) {