HCK-8010: add comma commenting for last activated column statement (#46)

forward_engineering/ddlProvider/ddlProvider.js

@@ -1,6 +1,7 @@
 const defaultTypes = require('../configs/defaultTypes');
 const descriptors = require('../configs/descriptors');
 const templates = require('./templates');
+const { joinActivatedAndDeactivatedStatements } = require('../utils/joinActivatedAndDeactivatedStatements');
 
 module.exports = (baseProvider, options, app) => {
 	const _ = app.require('lodash');
@@ -205,12 +206,13 @@ module.exports = (baseProvider, options, app) => {
 				partitionOf && !keyConstraintsValue && !checkConstraintsValue && !foreignKeyConstraintsString;
 			const openParenthesis = isEmptyPartitionBody ? '' : '(';
 			const closeParenthesis = isEmptyPartitionBody ? '' : ')';
+			const columnStatements = joinActivatedAndDeactivatedStatements({ statements: columns, indent: '\n\t' });
 
 			const tableStatement = assignTemplates(template, {
 				temporary: getTableTemporaryValue(temporary, unlogged),
 				ifNotExist: ifNotExistStr,
 				name: tableName,
-				columnDefinitions: !partitionOf ? '\t' + _.join(columns, ',\n\t') : '',
+				columnDefinitions: !partitionOf ? '\t' + columnStatements : '',
 				keyConstraints: keyConstraintsValue,
 				checkConstraints: checkConstraintsValue,
 				foreignKeyConstraints: foreignKeyConstraintsString,

forward_engineering/utils/joinActivatedAndDeactivatedStatements.js

@@ -0,0 +1,53 @@
+/**
+ * @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('--'));
+ const numberOfStatements = statements.length;
+
+ return statements
+	 .map((statement, index) => {
+		 const currentDelimiter = getDelimiter({
+			 index,
+			 numberOfStatements,
+			 lastIndexOfActivatedStatement,
+			 delimiter,
+		 });
+
+		 return statement + currentDelimiter;
+	 })
+	 .join(indent);
+};
+
+module.exports = {
+ joinActivatedAndDeactivatedStatements,
+};