Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions forward_engineering/alterScript/alterScriptFromDeltaHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,19 @@ const getAlterViewScripts = (collection, app, modelData) => {
};

const getInlineRelationships = ({ data, options }) => {
// Will be implemented with script generation options
return [];
if (options?.scriptGenerationOptions?.feActiveOptions?.foreignKeys !== 'inline') {
return [];
}

const addedCollectionIDs = getItems(data.properties?.entities?.properties?.added)
.filter(item => item && Object.values(item.properties)?.[0]?.compMod?.created)
.map(item => Object.values(item.properties)[0].role.id);

const addedRelationships = getItems(data.properties?.relationships?.properties?.added)
.map(item => item && Object.values(item.properties)[0])
.filter(r => r?.role?.compMod?.created && addedCollectionIDs.includes(r?.role?.childCollection));

return addedRelationships;
};

const getAlterRelationshipsScript = ({ collection, app, modelData, ignoreRelationshipIDs = [] }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ const getRelationshipName = ({ relationship }) => {
return compMod.code?.new || compMod.name?.new || relationship.role.code || relationship.role.name;
};

const getOldRelationshipName = ({ relationship }) => {
const compMod = relationship.role.compMod;
return compMod.code?.old || compMod.name?.old || relationship.role.code || relationship.role.name;
};

const getFullChildTableName = ({ relationship, modelData }) => {
const compMod = relationship.role.compMod;

Expand Down Expand Up @@ -94,7 +99,7 @@ const getAddForeignKeyScripts =
const getDeleteSingleForeignKeyStatementDto = ({ app, relationship, modelData }) => {
const compMod = relationship.role.compMod;
const tableName = getFullChildTableName({ relationship, modelData });
const relationshipName = getRelationshipName({ relationship });
const relationshipName = getOldRelationshipName({ relationship });
const constraintName = prepareConstraintName(relationshipName);
const assignTemplates = app.require('@hackolade/ddl-fe-utils').assignTemplates;

Expand Down