Skip to content

Commit ab6839a

Browse files
authored
Merge pull request #73 from taras-dubyk/main
HCK-3932: don't escape default value for array columns
2 parents 8316a59 + 4def5c6 commit ab6839a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

forward_engineering/ddlProvider/ddlHelpers/columnDefinitionHelper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ module.exports = ({ _, assignTemplates, templates, commentIfDeactivated, wrapCom
7676
const isString = type => ['char', 'varchar', 'text', 'bit', 'varbit'].includes(type);
7777
const isDateTime = type => ['date', 'time', 'timestamp', 'interval'].includes(type);
7878

79-
const decorateDefault = (type, defaultValue) => {
79+
const decorateDefault = (type, defaultValue, isArrayType) => {
8080
const constantsValues = ['current_timestamp', 'null'];
81-
if ((isString(type) || isDateTime(type)) && !constantsValues.includes(_.toLower(defaultValue))) {
81+
if ((isString(type) || isDateTime(type)) && !constantsValues.includes(_.toLower(defaultValue)) && !isArrayType) {
8282
return wrapComment(defaultValue);
8383
} else {
8484
return defaultValue;

forward_engineering/ddlProvider/ddlProvider.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,9 @@ module.exports = (baseProvider, options, app) => {
254254
? ' ' + createKeyConstraint(templates, true)(columnDefinition.uniqueKeyOptions).statement
255255
: '';
256256
const collation = columnDefinition.collationRule ? ` COLLATE "${columnDefinition.collationRule}"` : '';
257+
const isArrayType = Array.isArray(columnDefinition.array_type) && columnDefinition.array_type.length > 0;
257258
const defaultValue = !_.isUndefined(columnDefinition.default)
258-
? ' DEFAULT ' + decorateDefault(type, columnDefinition.default)
259+
? ' DEFAULT ' + decorateDefault(type, columnDefinition.default, isArrayType)
259260
: '';
260261

261262
return commentIfDeactivated(

0 commit comments

Comments
 (0)