Merge pull request #1 from DrMyroslav/HCK-1256-references-to-definitions-are-forwarded

add to script plain type of definitions

Author: DrMyroslav

forward_engineering/ddlProvider.js

@@ -59,7 +59,7 @@ module.exports = (baseProvider, options, app) => {
 		getColumnsList,
 	});
 
-	const { getUserDefinedType } = require('./helpers/udtHelper')({
+	const { getUserDefinedType, isNotPlainType } = require('./helpers/udtHelper')({
 		_,
 		commentIfDeactivated,
 		assignTemplates,
@@ -525,6 +525,15 @@ module.exports = (baseProvider, options, app) => {
 			};
 		},
 
+		hydrateJsonSchemaColumn(jsonSchema, definitionJsonSchema) {
+			if (!jsonSchema.$ref || _.isEmpty(definitionJsonSchema) || isNotPlainType(definitionJsonSchema)) {
+				return jsonSchema;
+			}
+
+			jsonSchema = _.omit(jsonSchema, '$ref');
+			return  { ...definitionJsonSchema, ...jsonSchema };
+		},
+
 		hydrateIndex(indexData, tableData, schemaData) {
 			return { ...indexData, schemaName: schemaData.schemaName };
 		},

forward_engineering/helpers/udtHelper.js

@@ -6,6 +6,7 @@ module.exports = ({
 	getNamePrefixedWithSchemaName,
 	wrapComment,
 }) => {
+	const notPlainTypes = ['composite', 'enum', 'range_udt', 'domain'];
 	const getPlainUdt = (udt, columns) => {
 		const udtName = getNamePrefixedWithSchemaName(udt.name, udt.schemaName);
 		const comment = assignTemplates(templates.comment, {
@@ -56,6 +57,10 @@ module.exports = ({
 		}
 	};
 
+	const isNotPlainType = (definitionJsonSchema) => {
+		return notPlainTypes.includes(definitionJsonSchema.type);
+	};
+
 	const getRangeOptions = udt => {
 		const wrap = value => (value ? `\t${value}` : '');
 
@@ -95,5 +100,5 @@ module.exports = ({
 		});
 	};
 
-	return { getUserDefinedType };
+	return { getUserDefinedType, isNotPlainType };
 };