HCK-8196: adjust FE script for displying default ON NULL clause

hackolade · Sep 27, 2024 · 61d5e44 · 61d5e44
1 parent 849c831
commit 61d5e44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/forward_engineering/ddlProvider/ddlHelpers/columnDefinitionHelper.js b/forward_engineering/ddlProvider/ddlHelpers/columnDefinitionHelper.js
@@ -55,7 +55,7 @@ module.exports = ({ _, wrap, assignTemplates, templates, commentIfDeactivated, w
 		return type;
 	};
 
-	const getColumnDefault = ({ default: defaultValue, identity }) => {
+	const getColumnDefault = ({ default: defaultValue, defaultOnNull, identity }) => {
 		if (!_.isEmpty(identity) && identity.generated) {
 			const getGenerated = ({ generated, generatedOnNull }) => {
 				if (generated === 'BY DEFAULT') {
@@ -73,8 +73,10 @@ module.exports = ({ _, wrap, assignTemplates, templates, commentIfDeactivated, w
 			};
 
 			return ` GENERATED${getGenerated(identity)} AS IDENTITY (${_.trim(getOptions(identity))})`;
-		} else if (defaultValue) {
-			return ` DEFAULT ${defaultValue}`;
+		} else if (defaultValue || defaultValue === 0) {
+			const onNull = defaultOnNull ? ' ON NULL' : '';
+
+			return ` DEFAULT${onNull} ${defaultValue}`;
 		}
 		return '';
 	};

diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js
@@ -214,6 +214,7 @@ module.exports = (baseProvider, options, app) => {
 				isUDTRef,
 				dimension: jsonSchema.dimension,
 				subtype: jsonSchema.subtype,
+				defaultOnNull: jsonSchema.defaultOnNull,
 				...(canHaveIdentity(jsonSchema.mode) && { identity: jsonSchema.identity }),
 			};
 		},