Skip to content

HCK-12184: Improve syntax of nockeck #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhii-filonenko merged 6 commits into from
Aug 1, 2025
Merged

HCK-12184: Improve syntax of nockeck #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3936a96
HCK-12141: Improvedcthe support of non check
Nightlngale Jul 31, 2025
5056bf7
HCK-12184: Add missing function call
Nightlngale Jul 31, 2025
a204b29
HCK-12184: Fix typo
Nightlngale Jul 31, 2025
0d27026
HCK-12184: Improve syntax of check constaint
Nightlngale Aug 1, 2025
207f709
HCK-12184: Remove old incorrect logic
Nightlngale Aug 1, 2025
5ab4ed4
HCK-12184: Resolve conflicts
Nightlngale Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions forward_engineering/configs/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {

spatialIndex: 'CREATE SPATIAL INDEX ${name} ON ${table} (${column})${using}\n${options}${terminator}\n',

checkConstraint: 'CONSTRAINT [${name}] ${check}${notForReplication} (${expression})',
checkConstraint: 'CONSTRAINT [${name}] CHECK${notForReplication} (${expression})',

createForeignKeyConstraint:
'CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey}) ${onDelete}${onUpdate}',
Expand Down Expand Up @@ -75,7 +75,7 @@ module.exports = {
addColumn: 'ADD ${script}',

addCheckConstraint:
'ALTER TABLE ${tableName} ADD CONSTRAINT ${constraintName} ${check} (${expression})${terminator}',
'ALTER TABLE ${tableName}${noCheck} ADD CONSTRAINT ${constraintName} CHECK (${expression})${terminator}',

addNotNullConstraint: 'ALTER TABLE ${tableName} ALTER COLUMN ${columnName} ${columnType} NOT NULL${terminator}',

Expand Down
7 changes: 3 additions & 4 deletions forward_engineering/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,9 @@ module.exports = (baseProvider, options, app) => {
return createTableIndex(terminator, tableName, index, isActivated && isParentActivated);
},

createCheckConstraint(checkConstraint, isInline = true) {
createCheckConstraint(checkConstraint) {
return assignTemplates(templates.checkConstraint, {
name: checkConstraint.name,
check: checkConstraint.check || isInline ? 'CHECK' : 'NOCHECK',
notForReplication: checkConstraint.enforceForReplication ? '' : ' NOT FOR REPLICATION',
expression: _.trim(checkConstraint.expression).replace(/^\(([\s\S]*)\)$/, '$1'),
terminator,
Expand Down Expand Up @@ -717,7 +716,7 @@ module.exports = (baseProvider, options, app) => {
alterTableAddCheckConstraint(fullTableName, checkConstraint) {
return assignTemplates(templates.alterTableAddConstraint, {
tableName: fullTableName,
constraint: this.createCheckConstraint(checkConstraint, false),
constraint: this.createCheckConstraint(checkConstraint),
terminator,
});
},
Expand Down Expand Up @@ -977,7 +976,7 @@ module.exports = (baseProvider, options, app) => {
constraintName,
expression,
terminator,
check: check ? 'CHECK' : 'NOCHECK',
noCheck: check ? '' : ' WITH NOCHECK',
};
return assignTemplates(templates.addCheckConstraint, templateConfig);
},
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/helpers/alterScriptHelpers/alterEntityHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = (app, options) => {
}),
);
const checkConstraints = (jsonSchema.chkConstr || []).map(check =>
ddlProvider.createCheckConstraint(ddlProvider.hydrateCheckConstraint(check), true),
ddlProvider.createCheckConstraint(ddlProvider.hydrateCheckConstraint(check)),
);
const tableData = {
name: tableName,
Expand Down
3 changes: 2 additions & 1 deletion forward_engineering/helpers/alterScriptHelpers/entityHelpers/checkConstraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ const getUpdateCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistor
const oldName = historyEntry.old.chkConstrName;
const newName = historyEntry.new.chkConstrName;
const hasOnlyNameChanged = oldExpression === newName && newName !== oldName;
const hasCheckChanged = historyEntry.old.constrCheck !== historyEntry.new.constrCheck;

return oldExpression !== newExpression || hasOnlyNameChanged;
return oldExpression !== newExpression || hasOnlyNameChanged || hasCheckChanged;
}
return false;
})
Expand Down