diff --git a/forward_engineering/helpers/alterScriptHelpers/alterEntityHelper.js b/forward_engineering/helpers/alterScriptHelpers/alterEntityHelper.js index 9f96826..81836cd 100644 --- a/forward_engineering/helpers/alterScriptHelpers/alterEntityHelper.js +++ b/forward_engineering/helpers/alterScriptHelpers/alterEntityHelper.js @@ -245,7 +245,7 @@ const getAddColumnsScripts = (definitions, provider) => entity => { const entityData = { ...entity, ..._.omit(entity.role, ['properties']) }; const { columns } = getColumns(entityData, true, definitions); const properties = getEntityProperties(entity); - const columnStatement = getColumnsStatement({ columns }); + const columnStatement = getColumnsStatement({ columns, isAlterScript: true }); const fullCollectionName = generateFullEntityName(entity); const { hydratedAddIndexes, hydratedDropIndexes } = hydrateIndex(entity, properties, definitions); const modifyScript = generateModifyCollectionScript(entity, definitions, provider); diff --git a/forward_engineering/helpers/columnHelper.js b/forward_engineering/helpers/columnHelper.js index 160c5ba..63319c7 100644 --- a/forward_engineering/helpers/columnHelper.js +++ b/forward_engineering/helpers/columnHelper.js @@ -344,10 +344,10 @@ const getColumns = (jsonSchema, areColumnConstraintsAvailable, definitions) => { return { columns, deactivatedColumnNames }; }; -const getColumnStatementParts = ({ collection, column }) => { +const getColumnStatementParts = ({ collection, column, isAlterScript }) => { const { name, type, comment, isActivated, isParentActivated } = column; const commentStatement = comment ? ` COMMENT '${encodeStringLiteral(comment)}'` : ''; - const { inline, separate } = getColumnConstraintsStatement({ collection, column }); + const { inline, separate } = getColumnConstraintsStatement({ collection, column, isAlterScript }); const isColumnActivated = isParentActivated ? isActivated : true; return { @@ -356,7 +356,7 @@ const getColumnStatementParts = ({ collection, column }) => { }; }; -const getColumnsStatement = ({ collection, columns, isParentActivated }) => { +const getColumnsStatement = ({ collection, columns, isParentActivated, isAlterScript }) => { const columnStatements = []; const constraintStatements = []; @@ -364,11 +364,12 @@ const getColumnsStatement = ({ collection, columns, isParentActivated }) => { const { columnStatement, constraintsStatement } = getColumnStatementParts({ collection, column: { ...columns[name], name, isParentActivated }, + isAlterScript, }); columnStatements.push(columnStatement); - if (constraintsStatement) { + if (!isAlterScript && constraintsStatement) { constraintStatements.push(constraintsStatement); } } @@ -376,7 +377,7 @@ const getColumnsStatement = ({ collection, columns, isParentActivated }) => { return [...columnStatements, ...constraintStatements].join(',\n'); }; -const getColumnConstraintsStatement = ({ collection, column }) => { +const getColumnConstraintsStatement = ({ collection, column, isAlterScript }) => { const result = { inline: '', separate: '', @@ -431,7 +432,7 @@ const getColumnConstraintsStatement = ({ collection, column }) => { ); } - if (defaultValue) { + if (defaultValue && !isAlterScript) { result.inline = ` DEFAULT ${defaultValue}`; }