From 6e0af8dd096fe8f19671376139f6d1cc22283cbd Mon Sep 17 00:00:00 2001
From: Serhii Filonenko <serhii.filonenko@binary-studio.com>
Date: Thu, 28 Aug 2025 12:57:58 +0300
Subject: [PATCH 1/3] HCK-12459: fix the order of alter statements

---
 .../helpers/alterScriptFromDeltaHelper.js     |  4 +--
 forward_engineering/helpers/keyHelper.js      | 27 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/forward_engineering/helpers/alterScriptFromDeltaHelper.js b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
index b65da81b..17fd5840 100644
--- a/forward_engineering/helpers/alterScriptFromDeltaHelper.js
+++ b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
@@ -370,14 +370,14 @@ module.exports = _ => {
 			'deleteViewsScriptsDtos',
 			'addColumnDropCommentsScriptsDtos',
 			'addTablesDropCommentsScriptsDtos',
-			'deleteColumnScriptsDtos',
 			'deleteCollectionScriptsDtos',
 			'deleteUdtScriptsDtos',
 			'createUdtScriptsDtos',
 			'createCollectionsScriptsDtos',
-			'modifyCollectionScriptsDtos',
 			'addColumnScriptsDtos',
 			'modifyColumnScriptDtos',
+			'modifyCollectionScriptsDtos',
+			'deleteColumnScriptsDtos',
 			'createViewsScriptsDtos',
 			'modifiedViewsScriptsDtos',
 			'addSchemasDropCommentsScriptsDtos',
diff --git a/forward_engineering/helpers/keyHelper.js b/forward_engineering/helpers/keyHelper.js
index e6ddccfb..5dc61dc1 100644
--- a/forward_engineering/helpers/keyHelper.js
+++ b/forward_engineering/helpers/keyHelper.js
@@ -121,11 +121,14 @@ module.exports = app => {
 	};
 
 	const getKeys = (keys, jsonSchema) => {
+		const newProperties = getSchemaNewProperties(jsonSchema);
+		const properties = { ...newProperties, ...jsonSchema.properties };
+
 		return keys.map(key => {
 			return {
-				name: findName(key.keyId, jsonSchema.properties),
+				name: findName(key.keyId, properties),
 				order: key.type === 'descending' ? 'DESC' : 'ASC',
-				isActivated: checkIfActivated(key.keyId, jsonSchema.properties),
+				isActivated: checkIfActivated(key.keyId, properties),
 			};
 		});
 	};
@@ -246,6 +249,26 @@ module.exports = app => {
 		return [primaryKeyConstraint, ...uniqueKeyConstraints].filter(Boolean);
 	};
 
+	/**
+	 * @param {JsonSchema} jsonSchema
+	 * @returns {JsonSchema}
+	 */
+	const getSchemaNewProperties = jsonSchema => {
+		if (!Array.isArray(jsonSchema.compMod?.newProperties)) {
+			return {};
+		}
+
+		return jsonSchema.compMod.newProperties.reduce((properties, property) => {
+			return {
+				...properties,
+				[property.code || property.name]: {
+					...property,
+					GUID: property.id,
+				},
+			};
+		}, {});
+	};
+
 	return {
 		getTableKeyConstraints,
 		isInlineUnique,

From 89d575223ef55484cec5d1cf16b78380cfe86d49 Mon Sep 17 00:00:00 2001
From: Serhii Filonenko <serhii.filonenko@binary-studio.com>
Date: Thu, 28 Aug 2025 16:08:51 +0300
Subject: [PATCH 2/3] HCK-12459: fix the order of alter statements

---
 forward_engineering/helpers/alterScriptFromDeltaHelper.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forward_engineering/helpers/alterScriptFromDeltaHelper.js b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
index 17fd5840..112f233d 100644
--- a/forward_engineering/helpers/alterScriptFromDeltaHelper.js
+++ b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
@@ -370,13 +370,14 @@ module.exports = _ => {
 			'deleteViewsScriptsDtos',
 			'addColumnDropCommentsScriptsDtos',
 			'addTablesDropCommentsScriptsDtos',
+			'deleteColumnScriptsDtos',
 			'deleteCollectionScriptsDtos',
 			'deleteUdtScriptsDtos',
 			'createUdtScriptsDtos',
 			'createCollectionsScriptsDtos',
 			'addColumnScriptsDtos',
-			'modifyColumnScriptDtos',
 			'modifyCollectionScriptsDtos',
+			'modifyColumnScriptDtos',
 			'deleteColumnScriptsDtos',
 			'createViewsScriptsDtos',
 			'modifiedViewsScriptsDtos',

From 764f0ea06100f7f1293646fa447f93574d6e070f Mon Sep 17 00:00:00 2001
From: Serhii Filonenko <serhii.filonenko@binary-studio.com>
Date: Thu, 28 Aug 2025 16:20:09 +0300
Subject: [PATCH 3/3] HCK-12459: fix the order of alter statements

---
 forward_engineering/helpers/alterScriptFromDeltaHelper.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forward_engineering/helpers/alterScriptFromDeltaHelper.js b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
index 112f233d..df89e30a 100644
--- a/forward_engineering/helpers/alterScriptFromDeltaHelper.js
+++ b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
@@ -378,7 +378,6 @@ module.exports = _ => {
 			'addColumnScriptsDtos',
 			'modifyCollectionScriptsDtos',
 			'modifyColumnScriptDtos',
-			'deleteColumnScriptsDtos',
 			'createViewsScriptsDtos',
 			'modifiedViewsScriptsDtos',
 			'addSchemasDropCommentsScriptsDtos',