Skip to content

HCK-12045: fix options and name for alter pk constraint #286

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
chulanovskyi-bs merged 2 commits into from
Jul 18, 2025
Merged

HCK-12045: fix options and name for alter pk constraint #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899c4a0
HCK-12045: add pk constraint options to alter statement
serhii-filonenko Jul 18, 2025
e3e7009
HCK-12045: add name preparation for pk constraint
serhii-filonenko Jul 18, 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
25 changes: 21 additions & 4 deletions forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ const getDefaultPkConstraintName = collection => {
return getEntityNameFromCollection(collection) + '_pk';
};

/**
* @param {object} primaryKey
* @returns {string}
*/
const getPkConstraintOptions = (primaryKey = {}) => {
const notEnforcedOption = primaryKey.notEnforced ? ' NOT ENFORCED' : '';
const deferrable = primaryKey.deferrable ? ' DEFERRABLE' : '';
const initiallyDeferrableOption = primaryKey.initiallyDeferrable ? ' INITIALLY DEFERRED' : '';
const noRelyOption = primaryKey.noRely ? ' NORELY' : '';

return notEnforcedOption + deferrable + initiallyDeferrableOption + noRelyOption;
};

/**
* @return {({collection, dbVersion }: {collection: Object, dbVersion: string }) => Array<AlterScriptDto>}
* */
Expand All @@ -66,12 +79,14 @@ const getAddCompositePkScripts =
const compositePrimaryKey = newPk.compositePrimaryKey || [];
const guidsOfColumnsInPk = compositePrimaryKey.map(compositePkEntry => compositePkEntry.keyId);
const columnNamesForDDL = getPropertiesNamesByGUIDs(collection, guidsOfColumnsInPk);
const constraintName = newPk.constraintName || getDefaultPkConstraintName(collection);
const pkConstraintName = newPk.constraintName || getDefaultPkConstraintName(collection);
const constraintName = prepareName(pkConstraintName);
const constraintOptions = getPkConstraintOptions(newPk);

if (!columnNamesForDDL.length) {
return undefined;
}
return ddlProvider.addPkConstraint(fullTableName, constraintName, columnNamesForDDL);
return ddlProvider.addPkConstraint(fullTableName, constraintName, columnNamesForDDL, constraintOptions);
})
.filter(Boolean)
.map(scriptLine => ({
Expand Down Expand Up @@ -139,10 +154,12 @@ const getAddPkScripts =
.map(([name, jsonSchema]) => {
const nameForDDl = prepareName(name);
const columnNamesForDDL = [nameForDDl];
const constraintName =
const pkConstraintName =
jsonSchema.primaryKeyOptions?.constraintName || getDefaultPkConstraintName(collection);
const constraintName = prepareName(pkConstraintName);
const constraintOptions = getPkConstraintOptions(jsonSchema.primaryKeyOptions);

return ddlProvider.addPkConstraint(fullTableName, constraintName, columnNamesForDDL);
return ddlProvider.addPkConstraint(fullTableName, constraintName, columnNamesForDDL, constraintOptions);
})
.map(scriptLine => ({
scripts: [
Expand Down
12 changes: 7 additions & 5 deletions forward_engineering/ddlProvider/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,19 @@ module.exports = app => {
},

/**
* @param tableName {string}
* @param constraintName {string}
* @param pkColumnNames {Array<string>}
* @return string
* @param {string} tableName
* @param {string} constraintName
* @param {Array<string>} pkColumnNames
* @param {string} constraintOptions
* @return {string}
* */
addPkConstraint(tableName, constraintName, pkColumnNames) {
addPkConstraint(tableName, constraintName, pkColumnNames, constraintOptions) {
const pkColumns = pkColumnNames.join(', ');
const templateConfig = {
tableName,
constraintName,
pkColumns,
constraintOptions,
};
return assignTemplates(templates.addPkConstraint, templateConfig);
},
Expand Down
3 changes: 2 additions & 1 deletion forward_engineering/ddlProvider/ddlTemplates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ module.exports = {

dropCheckConstraint: 'ALTER TABLE ${tableName} DROP CONSTRAINT IF EXISTS ${constraintName};',

addPkConstraint: 'ALTER TABLE ${tableName} ADD CONSTRAINT ${constraintName} PRIMARY KEY(${pkColumns});',
addPkConstraint:
'ALTER TABLE ${tableName} ADD CONSTRAINT ${constraintName} PRIMARY KEY(${pkColumns})${constraintOptions};',

dropPkConstraint: 'ALTER TABLE ${tableName} DROP PRIMARY KEY IF EXISTS ${dropPkOption};',

Expand Down