From 554c95af4ceed1f5228e0bc2de52c1fa6ebdfe0d Mon Sep 17 00:00:00 2001 From: ivan-m-dev Date: Thu, 26 Feb 2026 13:23:29 +0100 Subject: [PATCH 1/2] HCK-14987: add column level annotations --- forward_engineering/ddlProvider/ddlProvider.js | 5 +++++ forward_engineering/ddlProvider/templates.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index 54bf6b8..a759fb4 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -20,6 +20,7 @@ const { getColumnsList, prepareNameForScriptFormat, } = require('../utils/general'); +const { getAnnotationsString } = require('../utils/getAnnotationsString'); const { assignTemplates } = require('../utils/assignTemplates'); const { decorateType } = require('./ddlHelpers/columnDefinitionHelpers/decorateType'); const { getNotNullConstraints } = require('../alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper'); @@ -207,6 +208,7 @@ module.exports = (baseProvider, options, app) => { subtype: jsonSchema.subtype, defaultOnNull: jsonSchema.defaultOnNull, generatedDefaultValue: jsonSchema.generatedDefaultValue, + columnAnnotations: jsonSchema.columnAnnotations, }; }, @@ -222,6 +224,8 @@ module.exports = (baseProvider, options, app) => { convertColumnDefinition(columnDefinition, template = templates.columnDefinition) { const type = replaceTypeByVersion(columnDefinition.type, columnDefinition.dbVersion); + const annotations = ' ' + getAnnotationsString(prepareName)(columnDefinition.columnAnnotations); + return commentIfDeactivated( assignTemplates(template, { name: prepareName(columnDefinition.name), @@ -229,6 +233,7 @@ module.exports = (baseProvider, options, app) => { default: getColumnDefault(columnDefinition), encrypt: getColumnEncrypt(columnDefinition), constraints: getColumnConstraints(columnDefinition), + annotations, }), { isActivated: columnDefinition.isActivated, diff --git a/forward_engineering/ddlProvider/templates.js b/forward_engineering/ddlProvider/templates.js index 82dce34..50d5b0b 100644 --- a/forward_engineering/ddlProvider/templates.js +++ b/forward_engineering/ddlProvider/templates.js @@ -8,7 +8,7 @@ module.exports = { createTableProps: '${columnDefinitions}${keyConstraints}${checkConstraints}${foreignKeyConstraints}${notNullConstraints}', - columnDefinition: '${name}${type}${default}${encrypt}${constraints}', + columnDefinition: '${name}${type}${default}${encrypt}${constraints}${annotations}', createKeyConstraint: '${constraintName}${keyType}${columns}${options}', From 2dbab5b6a6a499e42c7313bd1f598ccac4d7a0fe Mon Sep 17 00:00:00 2001 From: ivan-m-dev Date: Thu, 26 Feb 2026 14:02:21 +0100 Subject: [PATCH 2/2] HCK-14987: fix unnecessary space --- forward_engineering/ddlProvider/ddlProvider.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index a759fb4..541e6f0 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -223,8 +223,8 @@ module.exports = (baseProvider, options, app) => { convertColumnDefinition(columnDefinition, template = templates.columnDefinition) { const type = replaceTypeByVersion(columnDefinition.type, columnDefinition.dbVersion); - - const annotations = ' ' + getAnnotationsString(prepareName)(columnDefinition.columnAnnotations); + const annotations = getAnnotationsString(prepareName)(columnDefinition.columnAnnotations); + const finalAnnotationsClause = annotations ? ' ' + annotations : ''; return commentIfDeactivated( assignTemplates(template, { @@ -233,7 +233,7 @@ module.exports = (baseProvider, options, app) => { default: getColumnDefault(columnDefinition), encrypt: getColumnEncrypt(columnDefinition), constraints: getColumnConstraints(columnDefinition), - annotations, + annotations: finalAnnotationsClause, }), { isActivated: columnDefinition.isActivated,