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

) This reverts commit aa029c0.
hackolade · Dec 5, 2024 · a27cdd4 · a27cdd4
1 parent aa029c0
commit a27cdd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js b/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js
@@ -1,13 +1,9 @@
 const _ = require('lodash');
-module.exports = ({ _, prepareName, getNamePrefixedWithSchemaName }) => {
+module.exports = ({ _, prepareName }) => {
 	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}
@@ -61,10 +57,12 @@ module.exports = ({ _, prepareName, getNamePrefixedWithSchemaName }) => {
 		return options;
 	};
 
+	const getIndexName = name => (name ? ` ${prepareName(name)}` : '');
+
 	return {
-		getIndexName,
 		getIndexType,
 		getIndexKeys,
 		getIndexOptions,
+		getIndexName,
 	};
 };
diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js
@@ -91,10 +91,9 @@ module.exports = (baseProvider, options, app) => {
 		prepareName,
 	});
 
-	const { getIndexType, getIndexName, getIndexKeys, getIndexOptions } = require('./ddlHelpers/indexHelper')({
+	const { getIndexType, getIndexKeys, getIndexOptions, getIndexName } = require('./ddlHelpers/indexHelper')({
 		_,
 		prepareName,
-		getNamePrefixedWithSchemaName,
 	});
 
 	const wrapIfNotExists = (statement, ifNotExist, errorCode = 955) => {
@@ -491,6 +490,7 @@ module.exports = (baseProvider, options, app) => {
 		},
 
 		createIndex(tableName, index, dbData, isParentActivated = true) {
+			const name = getIndexName(index.indxName);
 			const indexType = getIndexType(index.indxType);
 			const keys = getIndexKeys(index);
 			const indexOptions = getIndexOptions(index);
@@ -502,7 +502,7 @@ module.exports = (baseProvider, options, app) => {
 			let statement = assignTemplates(templates.createIndex, {
 				indexType,
 				ifNotExists: shouldInsertIfNotExistsStatement ? ' IF NOT EXISTS' : '',
-				name: getIndexName({ index }),
+				name,
 				keys,
 				options: indexOptions,
 				tableName: getNamePrefixedWithSchemaName(tableName, index.schemaName),
@@ -591,6 +591,7 @@ module.exports = (baseProvider, options, app) => {
 		},
 
 		createViewIndex(viewName, index, dbData, isParentActivated) {
+			const name = getIndexName(index.indxName);
 			const indexType = getIndexType(index.indxType);
 			const keys = getIndexKeys(index);
 			const options = getIndexOptions(index, isParentActivated);
@@ -602,7 +603,7 @@ module.exports = (baseProvider, options, app) => {
 			return commentIfDeactivated(
 				assignTemplates(templates.createIndex, {
 					indexType,
-					name: getIndexName({ index }),
+					name,
 					keys,
 					options,
 					tableName: getNamePrefixedWithSchemaName(viewName, index.schemaName),