HCK-14284: Clean up the code

Author: Nightlngale

forward_engineering/alterScript/alterScriptFromDeltaHelper.js

@@ -1,4 +1,3 @@
-const { isObjectInDeltaModelActivated } = require('../utils/general');
 const { getContainersScripts } = require('./alterScriptHelpers/alterContainerHelper');
 const {
 	getModifyCollectionScriptDtos,

forward_engineering/alterScript/alterScriptHelpers/alterContainerHelper.js

@@ -8,28 +8,29 @@ const {
 const { wrapInQuotes, getIsChangeProperties, getUpdatedProperties } = require('../../utils/general');
 const { getModifiedCommentOnSchemaScriptDtos } = require('./containerHelpers/commentsHelper');
 
-const getSchemaName = containerData => containerData.role.name;
+const extractSchemaName = containerData => containerData.role.name;
 
 const getAddContainerScriptDto = ddlProvider => containerData => {
 	const schemaData = {
 		...containerData.role,
-		schemaName: getSchemaName(containerData),
+		schemaName: extractSchemaName(containerData),
 	};
 	const script = ddlProvider.createSchema(schemaData);
 
 	return AlterScriptDto.getInstance([script], true, false);
 };
 
 const getDeleteContainerScriptDto = ddlProvider => containerData => {
-	const script = ddlProvider.dropSchema({ name: getSchemaName(containerData) });
+	const script = ddlProvider.dropSchema({ name: extractSchemaName(containerData) });
 
 	return AlterScriptDto.getInstance([script], true, true);
 };
 
 const getModifyContainerScriptDto = ddlProvider => containerData => {
 	const scripts = [];
 	const compMod = containerData.role?.compMod || {};
-	const schemaName = getSchemaName(containerData);
+	const schemaName = extractSchemaName(containerData);
+	const wrappedSchemaName = wrapInQuotes(schemaName);
 	const isActivated = containerData.isActivated !== false;
 	const updatedProperties = getUpdatedProperties(compMod, ['dataCapture']);
 
@@ -38,13 +39,17 @@ const getModifyContainerScriptDto = ddlProvider => containerData => {
 		scripts.push(AlterScriptDto.getInstance([alterDataCaptureScript], isActivated, false));
 	}
 
-	const commentScripts = getModifiedCommentOnSchemaScriptDtos({
-		schemaName,
+	const commentScript = getModifiedCommentOnSchemaScriptDtos({
+		schemaName: wrappedSchemaName,
 		compMod,
 		isActivated,
 	});
 
-	return [...scripts, ...commentScripts].filter(Boolean);
+	if (commentScript) {
+		scripts.push(commentScript);
+	}
+
+	return scripts;
 };
 
 const getContainersScripts = app => {

forward_engineering/alterScript/alterScriptHelpers/containerHelpers/commentsHelper.js

@@ -6,20 +6,19 @@ const {
 const { wrapInQuotes } = require('../../../utils/general');
 
 const getModifiedCommentOnSchemaScriptDtos = ({ schemaName, compMod, isActivated }) => {
-	const scripts = [];
 	const description = compMod.description || {};
 
 	if (description.new && description.new !== description.old) {
 		const script = getSchemaCommentStatement({ schemaName, description: description.new });
-		scripts.push(AlterScriptDto.getInstance([script], isActivated, false));
+		return AlterScriptDto.getInstance([script], isActivated, false);
 	}
 
 	if (description.old && !description.new) {
 		const script = dropSchemaCommentStatement({ schemaName });
-		scripts.push(AlterScriptDto.getInstance([script], isActivated, true));
+		return AlterScriptDto.getInstance([script], isActivated, true);
 	}
 
-	return scripts;
+	return undefined;
 };
 
 module.exports = {

forward_engineering/ddlProvider/ddlHelpers/comment/commentHelper.js

@@ -36,15 +36,12 @@ const getCommentStatement = ({ objectName, objectType, description, mode = COMME
 		return '';
 	}
 
-	const commentValue =
-		mode === COMMENT_MODE.remove ? 'NULL' : wrapInSingleQuotes({ name: escapeSpecialCharacters(description) });
-
 	return assignTemplates({
 		template: templates.comment,
 		templateData: {
 			objectType,
 			objectName: trim(objectName),
-			comment: commentValue,
+			comment: wrapInSingleQuotes({ name: escapeSpecialCharacters(description || '') }),
 		},
 	});
 };
@@ -121,43 +118,6 @@ const getColumnComments = ({ tableName, columnDefinitions = [] }) => {
 		.join('\n');
 };
 
-/**
- * @param {{ tableName: string, columnName: string }}
- * @returns {string}
- */
-const dropColumnCommentStatement = ({ tableName, columnName }) => {
-	const objectName = tableName + '.' + wrapInQuotes(columnName);
-	return getCommentStatement({
-		objectName,
-		objectType: OBJECT_TYPE.column,
-		mode: COMMENT_MODE.remove,
-	});
-};
-
-/**
- * @param {{ tableName: string }}
- * @returns {string}
- */
-const dropTableCommentStatement = ({ tableName }) => {
-	return getCommentStatement({
-		objectName: tableName,
-		objectType: OBJECT_TYPE.table,
-		mode: COMMENT_MODE.remove,
-	});
-};
-
-/**
- * @param {{ indexName: string }}
- * @returns {string}
- */
-const dropIndexCommentStatement = ({ indexName }) => {
-	return getCommentStatement({
-		objectName: indexName,
-		objectType: OBJECT_TYPE.index,
-		mode: COMMENT_MODE.remove,
-	});
-};
-
 /**
  * @param {{ schemaName: string }}
  * @returns {string}
@@ -178,7 +138,4 @@ module.exports = {
 	getIndexCommentStatement,
 
 	dropSchemaCommentStatement,
-	dropColumnCommentStatement,
-	dropTableCommentStatement,
-	dropIndexCommentStatement,
 };