HCK-5204: adjusted Cassandra Alter Script generation after fix in app (…

…#126)
hackolade · Apr 16, 2024 · e1333ce · e1333ce
1 parent 858bd22
commit e1333ce
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/forward_engineering/helpers/alterScriptBuilder.js b/forward_engineering/helpers/alterScriptBuilder.js
@@ -14,7 +14,7 @@ const getCommentedDropScript = (scriptDtos, data) => {
         return scriptDtos;
     }
     return scriptDtos.map((dto = {}) => {
-        if (!dto?.scripts[0]?.isDropScript || !dto?.scripts[0]?.script) {
+        if (!dto?.scripts?.[0]?.isDropScript || !dto?.scripts?.[0]?.script) {
             return dto;
         }
         return {

diff --git a/forward_engineering/helpers/alterScriptFromDeltaHelper.js b/forward_engineering/helpers/alterScriptFromDeltaHelper.js
@@ -255,13 +255,13 @@ const handleItem = (item, udtMap, generator, data) => {
 	alterTableScript = Object.keys(itemProperties)
 		.reduce((alterTableScript, tableKey) => {
 			const itemCompModData = itemProperties[tableKey].role.compMod;
-			const codeName = dependencies.lodash.get(itemProperties, `${tableKey}.role.code`, '');
-			const tableName = codeName.length ? codeName : tableKey;
 
 			if (!itemCompModData) {
 				return alterTableScript;
 			}
 
+			const codeName = dependencies.lodash.get(itemProperties, `${tableKey}.role.code`, '');
+			const tableName = codeName.length ? codeName : tableKey;
 			const tableProperties = itemProperties[tableKey].properties || {};
 
 			const keyspaceName = itemCompModData.keyspaceName;

diff --git a/forward_engineering/helpers/updateHelpers/indexHelper.js b/forward_engineering/helpers/updateHelpers/indexHelper.js
@@ -261,9 +261,8 @@ const getDropIndexScript = (keyspaceName, tableName, secIndxs = []) => secIndxs.
 const getAddSearchIndexScript = data => {
 	const { keyspaceName, tableName, searchIndex, dataSources, isActivated, dbVersion } = data;
 	const isExistScript = checkExistsScript(keyspaceName, tableName, 'createSearchIndexes');
-	const dataIndexScript = { ...scriptData, added: true, script: '' };
 	if (isExistScript) {
-		return [dataIndexScript];
+		return [];
 	}
 	setNameCollectionsScript(keyspaceName, tableName, 'createSearchIndexes');
 	const script = getIndexes(
@@ -468,9 +467,11 @@ const createDataSources = (item, data) => {
 	];
 };
 
+const getTableNameFromCompMod = table => table.role?.compMod?.collectionName?.new ?? table.role?.compMod?.collectionName?.old
+
 const getIndexTable = (item, data, tableIsChange) => {
 	const dataSources = createDataSources(item, data);
-	const tableName = item.role?.code || item.role?.name;
+	const tableName = item.role?.code || item.role?.name || getTableNameFromCompMod(item);
 	const keyspaceName = item.role.compMod?.keyspaceName;
 	const dbVersion = data.modelData[0].dbVersion;
 	const isActivated = item.role?.isActivated;

diff --git a/forward_engineering/helpers/updateHelpers/udtHelper.js b/forward_engineering/helpers/updateHelpers/udtHelper.js
@@ -116,7 +116,7 @@ const prepareField = (field, property) => {
 const getUpdateScript = (item, data, udtMap) => {
 	const { role = {}, properties } = item;
 	if (!properties) {
-		return [scriptData];
+		return [];
 	}
 	const keySpaces = getKeySpaces(role);
 	const udtName = role.code || role.name;