Skip to content

HCK-14046: escape constraint names #87

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 4 commits into from
Dec 18, 2025
Merged

HCK-14046: escape constraint names #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c913f76
HCK-14046: invalid constraint name
AlikRakhmonov Dec 18, 2025
6cbd27e
fix: normalized name escaping
chulanovskyi-bs Dec 18, 2025
74445c5
fix: normalized name escaping (part 2)
chulanovskyi-bs Dec 18, 2025
136c3f5
Merge branch 'develop' into HCK-14046
chulanovskyi-bs Dec 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
8 changes: 4 additions & 4 deletions forward_engineering/hiveHelpers/helpers/alterScriptHelpers/uniqueKeyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ const getDropCompositeUkScripts = ({ collection, provider }) => {
const oldUniqueKeys = pkDto.old || [];

return oldUniqueKeys.map(oldUk => {
const pkConstraintName =
const ukConstraintName =
oldUk.constraintName || getDefaultConstraintName({ collection, postfix: CONSTRAINT_POSTFIX.uniqueKey });
const constraintName = prepareName(pkConstraintName);
const constraintName = prepareName(ukConstraintName);

return provider.assignTemplates(templates.dropConstraint, {
tableName,
Expand All @@ -65,9 +65,9 @@ const getAddCompositeUkScripts = ({ collection, provider }) => {
const compositeUniqueKey = newUk.compositeUniqueKey || [];
const guidsOfColumnsInUk = compositeUniqueKey.map(compositeUkEntry => compositeUkEntry.keyId);
const columnNames = getPropertiesNamesByGUIDs(collection, guidsOfColumnsInUk);
const pkConstraintName =
const ukConstraintName =
newUk.constraintName || getDefaultConstraintName({ collection, postfix: CONSTRAINT_POSTFIX.uniqueKey });
const constraintName = prepareName(pkConstraintName);
const constraintName = prepareName(ukConstraintName);
const noValidate = newUk.noValidateSpecification ? ` ${newUk.noValidateSpecification}` : '';
const rely = newUk.rely ? ` ${newUk.rely}` : '';

Expand Down
9 changes: 5 additions & 4 deletions forward_engineering/hiveHelpers/helpers/constraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* @typedef {import('../types').ConstraintDto} ConstraintDto
* @typedef {import('../types').JsonSchema} JsonSchema
*/
const { prepareName } = require('./generalHelper');

const findName = (keyId, properties) => {
return Object.keys(properties).find(name => properties[name].GUID === keyId);
Expand Down Expand Up @@ -48,7 +49,7 @@ const getConstraintOpts = ({ noValidateSpecification, enableSpecification, rely

const getUniqueKeyStatement = (jsonSchema, isParentItemActivated) => {
const getStatement = ({ keys, name, constraintOptsStatement }) =>
`CONSTRAINT ${name} UNIQUE (${keys})${constraintOptsStatement}`;
`CONSTRAINT ${prepareName(name)} UNIQUE (${keys})${constraintOptsStatement}`;

const getColumnsName = columns => columns.map(column => column.name).join(', ');
const hydratedUniqueKeys = hydrateUniqueKeys(jsonSchema);
Expand Down Expand Up @@ -84,7 +85,7 @@ const getUniqueKeyStatement = (jsonSchema, isParentItemActivated) => {
const getCheckConstraint = jsonSchema => {
const checks = jsonSchema.chkConstr || [];
const createCheckStatement = ({ constraintName, checkExpression, constraintOptsStatement }) =>
`CONSTRAINT ${constraintName} CHECK (${checkExpression})${constraintOptsStatement}`;
`CONSTRAINT ${prepareName(constraintName)} CHECK (${checkExpression})${constraintOptsStatement}`;

const checkConstraint = checks.map(check => {
const { constraintName, rely, noValidateSpecification, enableSpecification, checkExpression } = check || {};
Expand All @@ -111,7 +112,7 @@ const getCompositePrimaryKeys = ({ jsonSchema }) => {
.filter(primaryKey => primaryKey.compositePrimaryKey?.length)
.map(primaryKey => ({
keyType: 'PRIMARY KEY',
name: primaryKey.constraintName,
name: prepareName(primaryKey.constraintName),
columns: getKeys(primaryKey.compositePrimaryKey, jsonSchema),
}));
};
Expand All @@ -129,7 +130,7 @@ const getCompositeUniqueKeys = ({ jsonSchema }) => {
.filter(uniqueKey => uniqueKey.compositeUniqueKey?.length)
.map(uniqueKey => ({
keyType: 'UNIQUE',
name: uniqueKey.constraintName,
name: prepareName(uniqueKey.constraintName),
columns: getKeys(uniqueKey.compositeUniqueKey, jsonSchema),
}));
};
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/hiveHelpers/helpers/foreignKeyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const getForeignKeyConstraint = ({
parentColumns,
disableNoValidate,
}) => {
const constraintNameStatement = constraintName ? `CONSTRAINT ${constraintName} ` : '';
const constraintNameStatement = constraintName ? `CONSTRAINT ${prepareName(constraintName)} ` : '';
const statement = `,${constraintNameStatement}FOREIGN KEY (${childColumns}) REFERENCES ${parentTableName}(${parentColumns}) ${disableNoValidate ? 'DISABLE NOVALIDATE' : ''}`;
return statement;
};
Expand Down