HCK-12404: fix Delta Model - missing SQL for entity property changes (#154)

* HCK-12458: Fix order of ALTER script statements for keys

* fix: order

* fix order

* ашч

Author: AlikRakhmonov

forward_engineering/alterScript/alterScriptFromDeltaHelper.js

@@ -11,6 +11,7 @@ const {
 	getDeleteColumnScriptDtos,
 	getModifyColumnScriptDtos,
 	getModifyCollectionScriptDtos,
+	getModifyCollectionKeysScriptDtos,
 } = require('./alterScriptHelpers/alterEntityHelper');
 const {
 	getDeleteUdtScriptDto,
@@ -111,6 +112,7 @@ const getAlterCollectionsScriptDtos = ({
 		.map(getDeleteCollectionScriptDto(app));
 
 	const modifyCollectionScriptDtos = modifyScriptsData.flatMap(getModifyCollectionScriptDtos({ dbVersion }));
+	const modifyCollectionKeysScriptDtos = modifyScriptsData.flatMap(getModifyCollectionKeysScriptDtos({ dbVersion }));
 
 	const addColumnScriptDtos = createScriptsData
 		.filter(item => !item?.compMod?.created)
@@ -131,6 +133,7 @@ const getAlterCollectionsScriptDtos = ({
 		...deleteCollectionScriptDtos,
 		...modifyCollectionScriptDtos,
 		...addColumnScriptDtos,
+		...modifyCollectionKeysScriptDtos,
 		...deleteColumnScriptDtos,
 		...modifyColumnScriptDtos,
 	].filter(Boolean);

forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js

@@ -88,19 +88,24 @@ const getModifyCollectionScriptDtos =
 	collection => {
 		const modifyCheckConstraintScriptDtos = getModifyCheckConstraintScriptDtos(collection);
 		const modifyCommentScriptDtos = getModifyEntityCommentsScriptDtos(collection);
+		return [...modifyCheckConstraintScriptDtos, ...modifyCommentScriptDtos].filter(Boolean);
+	};
+
+/**
+ * @return {(collection: AlterCollectionDto) => AlterScriptDto[]}
+ * */
+const getModifyCollectionKeysScriptDtos =
+	({ dbVersion }) =>
+	collection => {
 		const modifyPKConstraintDtos = getModifyPkConstraintsScriptDtos(collection);
 		const modifyUniqueKeyConstraintDtos = getModifyUniqueKeyConstraintsScriptDtos({
 			collection,
 			dbVersion,
 		});
 		const modifyIndexesScriptDtos = getModifyIndexesScriptDtos({ collection, dbVersion });
-		return [
-			...modifyCheckConstraintScriptDtos,
-			...modifyCommentScriptDtos,
-			...modifyPKConstraintDtos,
-			...modifyUniqueKeyConstraintDtos,
-			...modifyIndexesScriptDtos,
-		].filter(Boolean);
+		return [...modifyPKConstraintDtos, ...modifyUniqueKeyConstraintDtos, ...modifyIndexesScriptDtos].filter(
+			Boolean,
+		);
 	};
 
 /**
@@ -298,4 +303,5 @@ module.exports = {
 	getAddColumnScriptDtos,
 	getDeleteColumnScriptDtos,
 	getModifyColumnScriptDtos,
+	getModifyCollectionKeysScriptDtos,
 };