Skip to content

HCK-14477: Error is thrown when applying delta script after column type is changed in the renamed table #85

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
Feb 3, 2026
+44 −28
Merged

HCK-14477: Error is thrown when applying delta script after column type is changed in the renamed table #85

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
16f38bc
HCK-14477: Use updated collection name
Nightlngale Feb 1, 2026
4ec982c
HCK-14477: Restore the order of statements
Nightlngale Feb 2, 2026
03d9f86
HCK-14477: Fix order
Nightlngale Feb 2, 2026
12c0f3e
HCK-14477: Apply the feedback
Nightlngale Feb 3, 2026
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
2 changes: 1 addition & 1 deletion forward_engineering/alterScript/alterScriptFromDeltaHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ const getAlterScriptDtos = (data, app) => {
return [
...upsertedContainersScriptDtos,
...collectionsScriptDtos,
...viewScriptDtos,
...relationshipScriptDtos,
...viewScriptDtos,
...deletedContainersScriptDtos,
]
.filter(Boolean)
Expand Down
6 changes: 3 additions & 3 deletions forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const getAddCollectionScriptDto = (ddlProvider, inlineDeltaRelationships) => col
*/
const getDeleteCollectionScriptDto = ddlProvider => collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const script = ddlProvider.dropTable({ tableName: fullTableName });

return AlterScriptDto.getInstance([script], true, true);
Expand Down Expand Up @@ -126,7 +126,7 @@ const getModifyCollectionKeysScriptDtos = ddlProvider => collection => {
*/
const getAddColumnScriptDtos = ddlProvider => collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const schemaName = getSchemaNameFromCollection({ collection });
const schemaData = { schemaName };

Expand Down Expand Up @@ -155,7 +155,7 @@ const getAddColumnScriptDtos = ddlProvider => collection => {
*/
const getDeleteColumnScriptDtos = ddlProvider => collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema, preferAlterName: false });

return toPairs(collection.properties)
.filter(([name, jsonSchema]) => !jsonSchema.compMod)
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterColumnNameHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const alterColumnName = (tableName, oldColumnName, newColumnName) => {
*/
const getRenameColumnScriptDtos = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isObjectInDeltaModelActivated(collection);

Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterTypeHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const hasPrecisionOrScaleChanged = (collection, oldFieldName, currentJsonSchema)
*/
const getUpdateTypesScriptDtos = ddlProvider => collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isObjectInDeltaModelActivated(collection);
const schemaName = getSchemaNameFromCollection({ collection });
Expand Down
4 changes: 2 additions & 2 deletions forward_engineering/alterScript/alterScriptHelpers/columnHelpers/commentsHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const getUpdatedCommentOnColumnScriptDtos = collection => {
const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isObjectInDeltaModelActivated(collection);
const collectionSchema = getSchemaOfAlterCollection(collection);
const tableName = getFullCollectionName(collectionSchema);
const tableName = getFullCollectionName({ collectionSchema });

return _.toPairs(collection.properties)
.filter(([name, jsonSchema]) => {
Expand All @@ -38,7 +38,7 @@ const getDeletedCommentOnColumnScriptDtos = collection => {
const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isObjectInDeltaModelActivated(collection);
const collectionSchema = getSchemaOfAlterCollection(collection);
const tableName = getFullCollectionName(collectionSchema);
const tableName = getFullCollectionName({ collectionSchema });

return _.toPairs(collection.properties)
.filter(([name, jsonSchema]) => {
Expand Down
4 changes: 2 additions & 2 deletions forward_engineering/alterScript/alterScriptHelpers/columnHelpers/defaultValueHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const getUpdatedDefaultColumnValueScriptDtos = ({ collection }) => {
.map(([columnName, jsonSchema]) => {
const newDefaultValue = jsonSchema.default;
const scriptGenerationConfig = {
tableName: getFullCollectionName(collectionSchema),
tableName: getFullCollectionName({ collectionSchema }),
columnName: wrapInQuotes(columnName),
defaultValue: newDefaultValue,
};
Expand Down Expand Up @@ -92,7 +92,7 @@ const getDeletedDefaultColumnValueScriptDtos = ({ collection }) => {
})
.map(([columnName, jsonSchema]) => {
const scriptGenerationConfig = {
tableName: getFullCollectionName(collectionSchema),
tableName: getFullCollectionName({ collectionSchema }),
columnName: wrapInQuotes(columnName),
};
const isActivated = isContainerActivated && isCollectionActivated && jsonSchema.isActivated;
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const dropNotNullConstraint = (tableName, columnName) => {
*/
const getModifyNonNullColumnsScriptDtos = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });

const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isObjectInDeltaModelActivated(collection);
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const getUpdateCheckConstraintScriptDtos = (constraintHistory, fullTableName) =>

const getModifyCheckConstraintScriptDtos = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const constraintHistory = mapCheckConstraintNamesToChangeHistory(collection);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down
4 changes: 2 additions & 2 deletions forward_engineering/alterScript/alterScriptHelpers/entityHelpers/commentsHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const getUpdatedCommentOnCollectionScriptDto = collection => {
}

const collectionSchema = getSchemaOfAlterCollection(collection);
const tableName = getFullCollectionName(collectionSchema);
const tableName = getFullCollectionName({ collectionSchema });

const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);
Expand All @@ -44,7 +44,7 @@ const getDeletedCommentOnCollectionScriptDto = collection => {
}

const collectionSchema = getSchemaOfAlterCollection(collection);
const tableName = getFullCollectionName(collectionSchema);
const tableName = getFullCollectionName({ collectionSchema });

const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);
Expand Down
1 change: 0 additions & 1 deletion forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const {
getNamePrefixedWithSchemaName,
wrapInQuotes,
getSchemaOfAlterCollection,
getFullCollectionName,
getEntityName,
isObjectInDeltaModelActivated,
} = require('../../../utils/general');
Expand Down
8 changes: 4 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 @@ -161,7 +161,7 @@ const getAddCompositePkScriptDtos = collection => {
}

const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const entityName = getEntityName(collectionSchema);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down Expand Up @@ -198,7 +198,7 @@ const getDropCompositePkScriptDtos = collection => {
}

const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });

const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);
Expand Down Expand Up @@ -367,7 +367,7 @@ const wasRegularPkModified = (columnJsonSchema, collection) => {

const getAddPkScriptDtos = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const entityName = getEntityName(collectionSchema);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down Expand Up @@ -397,7 +397,7 @@ const getAddPkScriptDtos = collection => {

const getDropPkScriptDto = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });

const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);
Expand Down
8 changes: 4 additions & 4 deletions forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const getAddCompositeUniqueKeyScriptDtos = collection => {
}

const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const entityName = getEntityName(collectionSchema);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down Expand Up @@ -191,7 +191,7 @@ const getDropCompositeUniqueKeyScriptDtos = collection => {
}

const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const entityName = getEntityName(collectionSchema);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down Expand Up @@ -373,7 +373,7 @@ const wasRegularUniqueKeyModified = (columnJsonSchema, collection) => {

const getAddUniqueKeyScriptDtos = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const entityName = getEntityName(collectionSchema);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down Expand Up @@ -403,7 +403,7 @@ const getAddUniqueKeyScriptDtos = collection => {

const getDropUniqueKeyScriptDto = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const fullTableName = getFullCollectionName(collectionSchema);
const fullTableName = getFullCollectionName({ collectionSchema });
const entityName = getEntityName(collectionSchema);

const isContainerActivated = isParentContainerActivated(collection);
Expand Down
8 changes: 6 additions & 2 deletions forward_engineering/alterScript/alterScriptHelpers/viewHelpers/commentsHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ const getUpsertCommentsScriptDto = view => {
const comment = description.new;

const viewSchema = getSchemaOfAlterCollection(view);
const viewName = getFullCollectionName(viewSchema);
const viewName = getFullCollectionName({
collectionSchema: viewSchema,
});

const isContainerActivated = isParentContainerActivated(view);
const isViewActivated = isContainerActivated && isObjectInDeltaModelActivated(view);
Expand All @@ -37,7 +39,9 @@ const getDropCommentsScriptDto = view => {

if (description.old && !description.new) {
const viewSchema = getSchemaOfAlterCollection(view);
const viewName = getFullCollectionName(viewSchema);
const viewName = getFullCollectionName({
collectionSchema: viewSchema,
});

const isContainerActivated = isParentContainerActivated(view);
const isViewActivated = isContainerActivated && isObjectInDeltaModelActivated(view);
Expand Down
4 changes: 3 additions & 1 deletion forward_engineering/alterScript/alterScriptHelpers/viewHelpers/createDropViewHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ const createView = ({ ddlProvider, mapProperties, view }) => {
* @returns {string}
*/
const dropView = ({ ddlProvider, viewSchema }) => {
const viewName = getFullCollectionName(viewSchema);
const viewName = getFullCollectionName({
collectionSchema: viewSchema,
});

return ddlProvider.dropView({ viewName });
};
Expand Down
15 changes: 13 additions & 2 deletions forward_engineering/utils/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ const getColumnsList = (columns, isAllColumnsDeactivated, isParentActivated, map
*/
const toArray = ({ value }) => (Array.isArray(value) ? value : [value]);

const getAlterEntityName = entityData => {
return entityData?.compMod?.collectionName?.new;
};

const getEntityName = entityData => {
return entityData?.code || entityData?.collectionName || entityData?.name || '';
};
Expand All @@ -126,8 +130,15 @@ const getSchemaNameFromCollection = ({ collection }) => {
return collection.compMod?.keyspaceName;
};

const getFullCollectionName = collectionSchema => {
const name = getEntityName(collectionSchema);
const getFullCollectionName = ({ collectionSchema, preferAlterName = true }) => {
let name = '';

if (preferAlterName) {
name = getAlterEntityName(collectionSchema);
}

name = name || getEntityName(collectionSchema);

const schemaName = getSchemaNameFromCollection({ collection: collectionSchema });
return getNamePrefixedWithSchemaName({ name, schemaName });
};
Expand Down