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

* HCK-8971: include schema name in index name of DDL * HCK-8971: fix comments * HCK-8971: fix comments
hackolade · Dec 4, 2024 · 5096a56 · 5096a56
1 parent ef1f848
commit 5096a56
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -20,7 +20,7 @@ module.exports = (baseProvider, options, app) => {
 	const { assignTemplates, compareGroupItems } = app.require('@hackolade/ddl-fe-utils');
 	const { decorateDefault, decorateType, canBeNational, getSign, createGeneratedColumn, canHaveAutoIncrement } =
 		require('./helpers/columnDefinitionHelper')(_, wrap);
-	const { getTableName, getTableOptions, getPartitions, getViewData, getCharacteristics, escapeQuotes } =
+	const { getTableName, getIndexName, getTableOptions, getPartitions, getViewData, getCharacteristics, escapeQuotes } =
 		require('./helpers/general')(_, wrap);
 	const { generateConstraintsString, foreignKeysToString, foreignActiveKeysToString, createKeyConstraint } =
 		require('./helpers/constraintsHelper')({
@@ -430,7 +430,10 @@ module.exports = (baseProvider, options, app) => {
 			const wholeStatementCommented = index.isActivated === false || !isParentActivated || allDeactivated;
 			const indexType =
 				index.indexType && _.toUpper(index.indexType) !== 'KEY' ? `${_.toUpper(index.indexType)} ` : '';
-			const name = wrap(index.indxName || '', '`', '`');
+			const name = getIndexName({
+				name: index.indxName,
+				schemaName: dbData.databaseName,
+			})
 			const table = getTableName(tableName, dbData.databaseName);
 			const indexCategory = index.indexCategory ? ` USING ${index.indexCategory}` : '';
 			let indexOptions = [];

diff --git a/forward_engineering/helpers/general.js b/forward_engineering/helpers/general.js
@@ -67,14 +67,38 @@ module.exports = (_, wrap) => {
 		NDB: ['KEY_BLOCK_SIZE'],
 	};
 
-	const getTableName = (tableName, schemaName) => {
+	/**
+	 * @param {Object} params
+	 * @param {string} params.name
+	 * @param {string} params.schemaName
+	 * @returns {string}
+	 * */
+	const getNamePrefixedWithSchemaName = ({ name, schemaName }) => {
 		if (schemaName) {
-			return `\`${schemaName}\`.\`${tableName}\``;
-		} else {
-			return `\`${tableName}\``;
+			return `\`${schemaName}\`.\`${name}\``;
 		}
+		return `\`${name}\``;
+	};
+
+	/**
+	 * @param schemaName {string}
+	 * @param tableName {string}
+	 * @return {string}
+	 * */
+	const getTableName = (tableName, schemaName) => {
+		return getNamePrefixedWithSchemaName({ name: tableName, schemaName });
 	};
 
+	/**
+	 * @param {Object} params
+	 * @param {string} params.name
+	 * @param {string} params.schemaName
+	 * @returns {string}
+	 */
+	const getIndexName = ({ name, schemaName }) => {
+		return getNamePrefixedWithSchemaName({ name, schemaName });
+	}
+
 	const getOptionValue = (keyword, value) => {
 		if (['ROW_FORMAT', 'INSERT_METHOD'].includes(keyword)) {
 			if (value) {
@@ -323,6 +347,7 @@ module.exports = (_, wrap) => {
 
 	return {
 		getTableName,
+		getIndexName,
 		getTableOptions,
 		getPartitions,
 		getViewData,