HCK-8971: Restore "Create index" recent changes (#149)

* Revert "HCK-8971: include schema name in index name of DDL (#147)"

This reverts commit aa029c0.

* Reapply "HCK-8971: include schema name in index name of DDL (#147)"

This reverts commit c609fd6.

* Reapply "HCK-8971

* small fix

forward_engineering/ddlProvider/ddlHelpers/indexHelper.js

@@ -1,9 +1,13 @@
 const _ = require('lodash');
-module.exports = ({ _, prepareName }) => {
+module.exports = ({ _, prepareName, getNamePrefixedWithSchemaName }) => {
 	const getIndexType = indexType => {
 		return indexType ? ` ${_.toUpper(indexType)}` : '';
 	};
 
+	const getIndexName = ({ index }) => {
+		return index.indxName ? ` ${getNamePrefixedWithSchemaName(index.indxName, index.schemaName)}` : '';
+	};
+
 	/**
 	 * @param indxKey {Array<Object> | undefined}
 	 * @param column_expression {string | undefined}
@@ -57,12 +61,10 @@ module.exports = ({ _, prepareName }) => {
 		return options;
 	};
 
-	const getIndexName = name => (name ? ` ${prepareName(name)}` : '');
-
 	return {
+		getIndexName,
 		getIndexType,
 		getIndexKeys,
 		getIndexOptions,
-		getIndexName,
 	};
 };

forward_engineering/ddlProvider/ddlProvider.js

@@ -94,6 +94,7 @@ module.exports = (baseProvider, options, app) => {
 	const { getIndexType, getIndexKeys, getIndexOptions, getIndexName } = require('./ddlHelpers/indexHelper')({
 		_,
 		prepareName,
+		getNamePrefixedWithSchemaName,
 	});
 
 	const wrapIfNotExists = (statement, ifNotExist, errorCode = 955) => {
@@ -490,7 +491,7 @@ module.exports = (baseProvider, options, app) => {
 		},
 
 		createIndex(tableName, index, dbData, isParentActivated = true) {
-			const name = getIndexName(index.indxName);
+			const name = getIndexName({ index });
 			const indexType = getIndexType(index.indxType);
 			const keys = getIndexKeys(index);
 			const indexOptions = getIndexOptions(index);
@@ -591,7 +592,7 @@ module.exports = (baseProvider, options, app) => {
 		},
 
 		createViewIndex(viewName, index, dbData, isParentActivated) {
-			const name = getIndexName(index.indxName);
+			const name = getIndexName({ index });
 			const indexType = getIndexType(index.indxType);
 			const keys = getIndexKeys(index);
 			const options = getIndexOptions(index, isParentActivated);