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

* Revert "HCK-8740: [Oracle] RE from DDL file: missing quotation for default values reversed from 'ALTER COLUMN MODIFY' (#145)" This reverts commit ea6c5a8. * HCK-8971: include schema name in index name of DDL * HCK-8971: fix comments * HCK-8971: move to separate function
hackolade · Dec 4, 2024 · aa029c0 · aa029c0
1 parent cb781e9
commit aa029c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js b/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,
 	};
 };
diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js
@@ -91,9 +91,10 @@ module.exports = (baseProvider, options, app) => {
 		prepareName,
 	});
 
-	const { getIndexType, getIndexKeys, getIndexOptions, getIndexName } = require('./ddlHelpers/indexHelper')({
+	const { getIndexType, getIndexName, getIndexKeys, getIndexOptions } = require('./ddlHelpers/indexHelper')({
 		_,
 		prepareName,
+		getNamePrefixedWithSchemaName,
 	});
 
 	const wrapIfNotExists = (statement, ifNotExist, errorCode = 955) => {
@@ -490,7 +491,6 @@ 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,
+				name: getIndexName({ index }),
 				keys,
 				options: indexOptions,
 				tableName: getNamePrefixedWithSchemaName(tableName, index.schemaName),
@@ -591,7 +591,6 @@ 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);
@@ -603,7 +602,7 @@ module.exports = (baseProvider, options, app) => {
 			return commentIfDeactivated(
 				assignTemplates(templates.createIndex, {
 					indexType,
-					name,
+					name: getIndexName({ index }),
 					keys,
 					options,
 					tableName: getNamePrefixedWithSchemaName(viewName, index.schemaName),