HCK-7990: Fix splitting of column statements when deactivating the la…

…st one (#31)

<!--do not remove this marker, its needed to replace info when ticket
title is updated -->
<!--jira-description-action-hidden-marker-start-->

<table>
<td>
<a href="https://hackolade.atlassian.net/browse/HCK-7990"
title="HCK-7990" target="_blank"><img alt="Sub-bug"
src="https://hackolade.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10303?size=medium"
/>HCK-7990</a> [DB2]: DDL script is not valid when the last attribute is
commented in Table
  </td></table>
  <br />
 

<!--jira-description-action-hidden-marker-end-->

constants/constants.js

@@ -11,7 +11,10 @@ const TABLE_TYPE = {
 	view: 'VIEW',
 };
 
+const INLINE_COMMENT = '--';
+
 module.exports = {
 	ERROR_MESSAGE,
 	TABLE_TYPE,
+	INLINE_COMMENT,
 };

forward_engineering/ddlProvider/ddlHelpers/table/getTableProps.js

@@ -8,6 +8,8 @@ const {
 	divideIntoActivatedAndDeactivated,
 } = require('../../../utils/general');
 const { getOptionsString } = require('../constraint/getOptionsString');
+const { joinActivatedAndDeactivatedStatements } = require('../../../utils/joinActivatedAndDeactivatedStatements');
+const { INLINE_COMMENT } = require('../../../../constants/constants');
 
 /**
  * @typedef {{ activatedItems: string[], deactivatedItems: string[] }} DividedConstraints
@@ -117,7 +119,8 @@ const getTableProps = ({ columns, foreignKeyConstraints, keyConstraints, checkCo
 		dividedConstraints: { activatedItems: checkConstraints, deactivatedItems: [] },
 		isParentActivated: isActivated,
 	});
-	const columnsString = joinStatements({ statements: columns });
+	const columnsString = joinActivatedAndDeactivatedStatements({ statements: columns, indent: '\n\t' });
+
 	const tableProps = assignTemplates({
 		template: templates.createTableProps,
 		templateData: {

forward_engineering/ddlProvider/ddlProvider.js

@@ -30,32 +30,19 @@ const { getIndexOptions } = require('./ddlHelpers/index/getIndexOptions.js');
 const { getTableType } = require('./ddlHelpers/table/getTableType.js');
 const { getName } = require('./ddlHelpers/jsonSchema/jsonSchemaHelper.js');
 const { hydrateAuxiliaryTableData } = require('./ddlHelpers/table/hydrateAuxiliaryTableData.js');
+const { joinActivatedAndDeactivatedStatements } = require('../utils/joinActivatedAndDeactivatedStatements');
 
 /**
  * @param {{ columns: object[] }}
  * @returns {string}
  */
 const getViewColumnsAsString = ({ columns }) => {
-	const statements = columns.map(({ statement, isActivated }) =>
-		commentIfDeactivated(statement, { isActivated, isPartOfLine: false }),
-	);
-	const lastNonCommentIndex = statements.findLastIndex(statement => !statement.startsWith('--'));
+	const indent = '\n\t\t';
+	const statements = columns.map(({ statement, isActivated }) => {
+		return commentIfDeactivated(statement, { isActivated, isPartOfLine: false });
+	});
 
-	if (lastNonCommentIndex === -1) {
-		return statements.join('\n');
-	}
-
-	return statements
-		.map((st, index) => {
-			const isNotLast = index !== statements.length - 1;
-
-			if (lastNonCommentIndex === index && isNotLast) {
-				return `${st} -- ,`;
-			}
-
-			return `${st}${isNotLast ? ',' : ''}`;
-		})
-		.join('\n\t\t');
+	return indent + joinActivatedAndDeactivatedStatements({ statements, delimiter: ',', indent });
 };
 
 module.exports = (baseProvider, options, app) => {

forward_engineering/utils/general.js

@@ -1,4 +1,5 @@
 const { toLower } = require('lodash');
+const { INLINE_COMMENT } = require('../../constants/constants');
 
 /**
  * @param {{ text: string, tab: string }}
@@ -53,7 +54,7 @@ const divideIntoActivatedAndDeactivated = ({ items, mapFunction }) => {
  * @param {{ isActivated: boolean, isPartOfLine: boolean, inlineComment: string }}
  * @returns {string}
  */
-const commentIfDeactivated = (statement, { isActivated, isPartOfLine, inlineComment = '--' }) => {
+const commentIfDeactivated = (statement, { isActivated, isPartOfLine, inlineComment = INLINE_COMMENT }) => {
 	if (isActivated !== false) {
 		return statement;
 	}

forward_engineering/utils/joinActivatedAndDeactivatedStatements.js

@@ -0,0 +1,55 @@
+const { INLINE_COMMENT } = require('../../constants/constants');
+
+/**
+ * @param {{
+ * index: number;
+ * numberOfStatements: number;
+ * lastIndexOfActivatedStatement: number;
+ * delimiter: string;
+ * }}
+ * @return {string}
+ * */
+const getDelimiter = ({ index, numberOfStatements, lastIndexOfActivatedStatement, delimiter }) => {
+	const isLastStatement = index === numberOfStatements - 1;
+	const isLastActivatedStatement = index === lastIndexOfActivatedStatement;
+
+	if (isLastStatement) {
+		return '';
+	}
+
+	if (isLastActivatedStatement) {
+		return ' --' + delimiter;
+	}
+
+	return delimiter;
+};
+
+/**
+ * @param {{
+ * statements: string[];
+ * delimiter?: string;
+ * indent?: string;
+ * }}
+ * @return {string}
+ * */
+const joinActivatedAndDeactivatedStatements = ({ statements, delimiter = ',', indent = '\n' }) => {
+	const lastIndexOfActivatedStatement = statements.findLastIndex(statement => !statement.startsWith(INLINE_COMMENT));
+	const numberOfStatements = statements.length;
+
+	return statements
+		.map((statement, index) => {
+			const currentDelimiter = getDelimiter({
+				index,
+				numberOfStatements,
+				lastIndexOfActivatedStatement,
+				delimiter,
+			});
+
+			return statement + currentDelimiter;
+		})
+		.join(indent);
+};
+
+module.exports = {
+	joinActivatedAndDeactivatedStatements,
+};