Skip to content

HCK-14070: References require DB name if it exists #93

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
Dec 19, 2025
Merged

HCK-14070: References require DB name if it exists #93

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
57718dd
HCK-14070: References require DB name if it exists
AlikRakhmonov Dec 19, 2025
b6a6bd1
fix
AlikRakhmonov Dec 19, 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
14 changes: 9 additions & 5 deletions forward_engineering/hiveHelpers/helpers/alterScriptHelpers/alterForeignKeyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ const { prepareName, commentDeactivatedStatements } = require('../generalHelper'

const templates = require('./config/templates');
const { getItems } = require('./common');
const { CONSTRAINT_POSTFIX } = require('../constants');

const getRelationshipName = relationship => {
return relationship.role.code || relationship.role.name;
const getRelationshipName = (relationship, parentTableName, childTableName) => {
const compMod = relationship.role.compMod;
const name = compMod.code?.new || compMod.name?.new || relationship.role.code || relationship.role.name;
if (name) {
return name;
}
return prepareName([parentTableName, childTableName, CONSTRAINT_POSTFIX.foreignKey].filter(Boolean).join('_'));
};

const getFullParentTableName = relationship => {
Expand All @@ -30,8 +36,7 @@ const getAddSingleForeignKeyScript = provider => relationship => {
const parentTableName = getFullParentTableName(relationship);
const childTableName = getFullChildTableName(relationship);

const relationshipName = compMod.code?.new || compMod.name?.new || getRelationshipName(relationship) || '';
const constraintName = prepareName(relationshipName);
const constraintName = getRelationshipName(relationship, parentTableName, childTableName);
const childColumns = compMod.child.collection.fkFields.map(field => prepareName(field.name));
const parentColumns = compMod.parent.collection.fkFields.map(field => prepareName(field.name));
const disableNoValidate = relationship.role?.compMod?.customProperties?.new?.disableNoValidate;
Expand All @@ -53,7 +58,6 @@ const canRelationshipBeAdded = relationship => {
return false;
}
return [
compMod.code?.new || compMod.name?.new || getRelationshipName(relationship),
compMod.parent?.bucket,
compMod.parent?.collection,
compMod.parent?.collection?.fkFields?.length,
Expand Down
22 changes: 8 additions & 14 deletions forward_engineering/hiveHelpers/helpers/foreignKeyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,30 +57,24 @@ const getForeignKeyHashTable = ({
}

const constraintName = relationship.code || relationship.name;
const parentDifferentSchemaName = prepareName(relatedSchemas[relationship.parentCollection]?.bucketName) || '';
const parentSchema =
jsonSchemas[relationship.parentCollection] ?? relatedSchemas[relationship.parentCollection];
const childSchema = jsonSchemas[relationship.childCollection] ?? relatedSchemas[relationship.childCollection];
const parentDifferentSchemaName = prepareName(parentSchema?.bucketName) || '';
const parentTableData = getTab(0, entityData[relationship.parentCollection]);
const parentTableSingleName =
prepareName(getName(parentTableData) || relatedSchemas[relationship.parentCollection]?.collectionName) ||
'';
const parentTableSingleName = prepareName(getName(parentTableData) || parentSchema?.collectionName) || '';
const parentTableName = parentDifferentSchemaName
? `${parentDifferentSchemaName}.${parentTableSingleName}`
: parentTableSingleName;
const childTableData = getTab(0, entityData[relationship.childCollection]);
const childTableName =
prepareName(getName(childTableData) || relatedSchemas[relationship.childCollection]?.collectionName) || '';
const childTableName = prepareName(getName(childTableData) || childSchema?.collectionName) || '';
const groupKey = parentTableName + constraintName;
const childFieldActivated = relationship.childField.reduce((isActivated, field) => {
const fieldData = schemaHelper.getItemByPath(
field.slice(1),
jsonSchemas[relationship.childCollection] ?? relatedSchemas[relationship.childCollection],
);
const fieldData = schemaHelper.getItemByPath(field.slice(1), childSchema);
return isActivated && _.get(fieldData, 'isActivated');
}, true);
const parentFieldActivated = relationship.parentField.reduce((isActivated, field) => {
const fieldData = schemaHelper.getItemByPath(
field.slice(1),
jsonSchemas[relationship.parentCollection] ?? relatedSchemas[relationship.parentCollection],
);
const fieldData = schemaHelper.getItemByPath(field.slice(1), parentSchema);
return isActivated && _.get(fieldData, 'isActivated');
}, true);

Expand Down