From d4c519d6bf61b1dacb1f28e2d47c908d3efe5ec4 Mon Sep 17 00:00:00 2001
From: yevhenii moroziuk <yevhen.moroziuk@hackolade.com>
Date: Thu, 14 Aug 2025 16:13:52 +0300
Subject: [PATCH 1/2] HCK-12377: Do not format comments

---
 forward_engineering/utils/general.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/forward_engineering/utils/general.js b/forward_engineering/utils/general.js
index 4b7f6132..ce0b62f2 100644
--- a/forward_engineering/utils/general.js
+++ b/forward_engineering/utils/general.js
@@ -166,10 +166,15 @@ module.exports = _ => {
 		return name.replace(/'/g, "''");
 	};
 
+	const skipSqlCommentsPattern = /^\s*(EXEC(UTE)?\b|.*\bMS_DESCRIPTION\b)/i;
+
 	const buildScript = statements => {
-		const formattedScripts = statements
-			.filter(Boolean)
-			.map(script => sqlFormatter.format(script, { indent: '    ' }).replace(/\{ \{ (.+?) } }/g, '{{$1}}'));
+		const formattedScripts = statements.filter(Boolean).map(script => {
+			if (skipSqlCommentsPattern.test(script)) {
+				return script;
+			}
+			return sqlFormatter.format(script, { indent: '    ' }).replace(/\{ \{ (.+?) } }/g, '{{$1}}');
+		});
 
 		return formattedScripts.join('\n\n') + '\n\n';
 	};

From 76102eb90f7aeb3a3f3eaff0e4b8bb43e1f7b69b Mon Sep 17 00:00:00 2001
From: yevhenii moroziuk <yevhen.moroziuk@hackolade.com>
Date: Thu, 14 Aug 2025 16:37:25 +0300
Subject: [PATCH 2/2] HCK-12377: Simplify the code

---
 forward_engineering/utils/general.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/forward_engineering/utils/general.js b/forward_engineering/utils/general.js
index ce0b62f2..b8701c25 100644
--- a/forward_engineering/utils/general.js
+++ b/forward_engineering/utils/general.js
@@ -166,15 +166,16 @@ module.exports = _ => {
 		return name.replace(/'/g, "''");
 	};
 
-	const skipSqlCommentsPattern = /^\s*(EXEC(UTE)?\b|.*\bMS_DESCRIPTION\b)/i;
+	const skipSqlCommentsPattern = /^\s*(EXEC\b|.*\bMS_DESCRIPTION\b)/i;
 
 	const buildScript = statements => {
-		const formattedScripts = statements.filter(Boolean).map(script => {
-			if (skipSqlCommentsPattern.test(script)) {
-				return script;
-			}
-			return sqlFormatter.format(script, { indent: '    ' }).replace(/\{ \{ (.+?) } }/g, '{{$1}}');
-		});
+		const formattedScripts = statements
+			.filter(Boolean)
+			.map(script =>
+				skipSqlCommentsPattern.test(script)
+					? script
+					: sqlFormatter.format(script, { indent: '    ' }).replace(/\{ \{ (.+?) } }/g, '{{$1}}'),
+			);
 
 		return formattedScripts.join('\n\n') + '\n\n';
 	};