fix position alter search, reaload seach index

Author: DrMyroslav

forward_engineering/helpers/updateHelper.js

@@ -553,55 +553,44 @@ const sortScript = (scriptData) => {
 
 			return scripts;
 		}, { scripts: [], filteredScripts: [] });
-	}
+	};
+
+	const orderForScripts = [
+		['keySpaces', 'added'],
+		['keySpaces', 'modified'],
+		['view', 'deleted'],
+		['index', 'deleted'],
+		['renewal', 'deleted'],
+		['table', 'deleted'],
+		['udt', 'deleted'],
+		['udt', 'added'],
+		['udt', 'modified'],
+		['table', 'added'],
+		['table', 'modified'],
+		['field', 'deleted'],
+		['field', 'added'],
+		['field', 'modified'],
+		['index', 'added'],
+		['index', 'modified'],
+		['renewal', 'added'],
+		['view', 'added'],
+		['view', 'modified'],
+		['udf', 'deleted'],
+		['udf', 'added'],
+		['keySpaces', 'deleted'],
+	];
+	const sortedScripts = orderForScripts.reduce((script, [key, prop]) => {
+		const { scripts, filteredScripts } = filter(prop, script.filteredScripts, key);
+		return {
+			sorted: [...script.sorted, ...scripts],
+			filteredScripts
+		}
+	}, {
+		sorted: [],
+		filteredScripts: scriptData
+	});
 
-	let sortedScripts = [];
-
-	const { scripts: createKeyspacesScripts, filteredScripts: scriptsWithoutCreateKeyspace } = filter('added', scriptData, 'keySpaces');
-	const { scripts: deleteKeyspaceScripts, filteredScripts: scriptsWithoutDropKeyspace } = filter('deleted', scriptsWithoutCreateKeyspace, 'keySpaces');
-	const { scripts: modifyKeyspacesScripts, filteredScripts: scriptsWithoutModifyKeyspace } = filter('modified', scriptsWithoutDropKeyspace, 'keySpaces');
-	const { scripts: deleteFunctionScripts, filteredScripts: scriptsWithoutDropFunction } = filter('deleted', scriptsWithoutModifyKeyspace, 'udf');
-	const { scripts: createFunctionScripts, filteredScripts: scriptsWithoutCreateFunction } = filter('added', scriptsWithoutDropFunction, 'udf');
-	const { scripts: createTablesScripts, filteredScripts: scriptsWithoutCreateTable } = filter('added', scriptsWithoutCreateFunction, 'table');
-	const { scripts: deleteTablesScripts, filteredScripts: scriptsWithoutDropTable } = filter('deleted', scriptsWithoutCreateTable, 'table');
-	const { scripts: modifyTablesScripts, filteredScripts: scriptsWithoutModifyTable } = filter('modified', scriptsWithoutDropTable, 'table');
-	const { scripts: createIndexesScripts, filteredScripts: scriptsWithoutCreateIndexes } = filter('added', scriptsWithoutModifyTable, 'index');
-	const { scripts: deleteIndexesScripts, filteredScripts: scriptsWithoutDropIndexes } = filter('deleted', scriptsWithoutCreateIndexes, 'index');
-	const { scripts: modifyIndexesScripts, filteredScripts: scriptsWithoutModifyIndexes } = filter('modified', scriptsWithoutDropIndexes, 'index');
-	const { scripts: renewalIndexesScripts, filteredScripts: scriptsWithoutRenewalIndexes } = filter('added', scriptsWithoutModifyIndexes, 'renewal');
-	const { scripts: createViewsScripts, filteredScripts: scriptsWithoutCreateViews } = filter('added', scriptsWithoutRenewalIndexes, 'viewName');
-	const { scripts: deleteViewsScripts, filteredScripts: scriptsWithoutDeleteViews } = filter('deleted', scriptsWithoutCreateViews, 'viewName');
-	const { scripts: modifyViewsScripts, filteredScripts: scriptsWithoutModifyViews } = filter('modified', scriptsWithoutDeleteViews, 'viewName');
-	const { scripts: createFieldsScripts, filteredScripts: scriptsWithoutCreateField } = filter('added', scriptsWithoutModifyViews, 'field');    
-	const { scripts: deleteFieldsScripts, filteredScripts: scriptsWithoutDeleteField } = filter('deleted', scriptsWithoutCreateField, 'field');
-	const { scripts: modifyFieldsScripts, filteredScripts: scriptsWithoutModifyField } = filter('modified', scriptsWithoutDeleteField, 'field');
-	const { scripts: createUdtScripts, filteredScripts: scriptsWithoutCreateUdt } = filter('added', scriptsWithoutModifyField, 'udtName');
-	const { scripts: deleteUdtScripts, filteredScripts: scriptsWithoutDeleteUdt } = filter('deleted', scriptsWithoutCreateUdt, 'udtName');
-	const { scripts: modifyUdtScripts, filteredScripts: scriptsWithoutModifyUdt } = filter('modified', scriptsWithoutDeleteUdt, 'udtName');
-
-	return sortedScripts.concat(
-		createKeyspacesScripts,
-		modifyKeyspacesScripts,
-		deleteViewsScripts,
-		deleteTablesScripts,
-		deleteUdtScripts,
-		createUdtScripts,
-		modifyUdtScripts,
-		createTablesScripts,
-		modifyTablesScripts,
-		deleteFieldsScripts,
-		createFieldsScripts,
-		modifyFieldsScripts,
-		deleteIndexesScripts,
-		createIndexesScripts,
-		modifyIndexesScripts,
-		createViewsScripts,
-		modifyViewsScripts,
-		renewalIndexesScripts,
-		deleteFunctionScripts,
-		createFunctionScripts,
-		deleteKeyspaceScripts,
-		scriptsWithoutModifyUdt).map(data => data.script);
+	return [...sortedScripts.sorted, ...sortedScripts.filteredScripts].map(data => data.script);
 }
 
 module.exports = {

forward_engineering/helpers/updateHelpers/indexHelper.js

@@ -205,22 +205,25 @@ const getSearchColumnsScript = (keyspaceName, tableName, columns) => {
 		};
 	};
 
-	const dropScripts = (columns.dropData || []).map(getScript.bind(null, alterScript, `DROP field`, { deleted: true }));
-	const addScripts = (columns.addData || []).map(getScript.bind(null, alterScript, `ADD field`, { modified: true }));
+	const dropSearchScripts = (columns.dropData || []).map(getScript.bind(null, alterScript, `DROP field`, { deleted: true }));
+	const addSearchScripts = (columns.addData || []).map(getScript.bind(null, alterScript, `ADD field`, { modified: true }));
+	if (dropSearchScripts.length) {
+		dropSearchScripts.push(getRenewalScript(keyspaceName, tableName, 'RELOAD', 'deleted'));
+	}
 
-	return [...dropScripts, ...addScripts];
+	return { dropSearchScripts, addSearchScripts };
 }
 
-const getRenewalScript = (keyspaceName, tableName, startStatement) => {
+const getRenewalScript = (keyspaceName, tableName, startStatement, key = 'added') => {
 	const tableNameStatement = getTableNameStatement(keyspaceName, tableName);
 	const script = `${startStatement} SEARCH INDEX\n` +
 		tab(`ON ${tableNameStatement};`);
 
 	return {
-		added: true,
 		renewal: true,
-		script,
-	}
+		[key]: true,
+		script
+	};
 }
 
 const getDropSearchIndexScript = (keyspaceName, tableName, isDrop) => {
@@ -355,11 +358,11 @@ const getUpdateSearchIndexScript = data => {
 	const dataForConfigScript = getDataForSearchIndexConfig(config);
 
 	const configScript = getSearchConfigScript(keyspaceName, tableName, dataForConfigScript);
-	const columnsScript = getSearchColumnsScript(keyspaceName, tableName, dataForColumnsScript);
+	const { dropSearchScripts, addSearchScripts } = getSearchColumnsScript(keyspaceName, tableName, dataForColumnsScript);
 
 	const renewalData = {
-		RELOAD: configScript.length || columnsScript.length,
-		REBUILD: columnsScript.length,
+		RELOAD: configScript.length || addSearchScripts.length,
+		REBUILD: dropSearchScripts.length || addSearchScripts.length,
 	};
 	const renewalScripts = Object.entries(renewalData).reduce((scripts, [key, value]) => {
 		if (!value) {
@@ -368,7 +371,7 @@ const getUpdateSearchIndexScript = data => {
 		return [...scripts, getRenewalScript(keyspaceName, tableName, key)];
 	}, []);
 
-	return [...configScript, ...columnsScript, ...renewalScripts];
+	return [...configScript, ...dropSearchScripts, ...addSearchScripts, ...renewalScripts];
 }
 
 const getUpdateIndexScript = data => {

forward_engineering/helpers/updateHelpers/udtHelper.js

@@ -15,7 +15,7 @@ const scriptData = {
 	added: false,
 	deleted: false,
 	modified: false,
-	udtName: 'udt',
+	udt: 'udt',
 };
 
 const getAlterTypePrefix = keySpaceName => `ALTER TYPE "${keySpaceName}"`;

forward_engineering/helpers/updateHelpers/viewHelper.js

@@ -9,7 +9,7 @@ const scriptData = {
 	added: false,
 	deleted: false,
 	modified: false,
-	viewName: 'view',
+	view: 'view',
 };
 
 const getViewName = (keyspaceName, nameView) => `${keyspaceName ? `"${keyspaceName}".` : ''}"${nameView}"`;