diff --git a/forward_engineering/alterScript/alterScriptFromDeltaHelper.js b/forward_engineering/alterScript/alterScriptFromDeltaHelper.js index 8306a52..1f41ca2 100644 --- a/forward_engineering/alterScript/alterScriptFromDeltaHelper.js +++ b/forward_engineering/alterScript/alterScriptFromDeltaHelper.js @@ -266,8 +266,8 @@ const getAlterScriptDtos = (data, app) => { return [ ...upsertedContainersScriptDtos, ...collectionsScriptDtos, - ...viewScriptDtos, ...relationshipScriptDtos, + ...viewScriptDtos, ...deletedContainersScriptDtos, ] .filter(Boolean) diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js index f1e631c..75dadab 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterEntityHelper.js @@ -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); @@ -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 }; @@ -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) diff --git a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterColumnNameHelper.js b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterColumnNameHelper.js index 00b20e9..cc30946 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterColumnNameHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterColumnNameHelper.js @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterTypeHelper.js b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterTypeHelper.js index cea2a67..9eb01bf 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterTypeHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/alterTypeHelper.js @@ -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 }); diff --git a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/commentsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/commentsHelper.js index 4b78ce1..25ac97f 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/commentsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/commentsHelper.js @@ -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]) => { @@ -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]) => { diff --git a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/defaultValueHelper.js b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/defaultValueHelper.js index ee02612..c1a22bb 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/defaultValueHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/defaultValueHelper.js @@ -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, }; @@ -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; diff --git a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js index 7f901e8..8051f9f 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js index 175701d..45c1aa3 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/commentsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/commentsHelper.js index f5efe69..321127f 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/commentsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/commentsHelper.js @@ -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); @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js index f6b4715..72991e1 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js @@ -5,7 +5,6 @@ const { getNamePrefixedWithSchemaName, wrapInQuotes, getSchemaOfAlterCollection, - getFullCollectionName, getEntityName, isObjectInDeltaModelActivated, } = require('../../../utils/general'); diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js index 20e9b0e..fe04b99 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js @@ -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); @@ -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); @@ -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); @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js index e16853b..8ef5637 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js @@ -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); @@ -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); @@ -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); @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/commentsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/commentsHelper.js index 61615f2..d656d7e 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/commentsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/commentsHelper.js @@ -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); @@ -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); diff --git a/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/createDropViewHelper.js b/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/createDropViewHelper.js index c3151e6..1a746fe 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/createDropViewHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/viewHelpers/createDropViewHelper.js @@ -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 }); }; diff --git a/forward_engineering/utils/general.js b/forward_engineering/utils/general.js index 37aa491..54f092f 100644 --- a/forward_engineering/utils/general.js +++ b/forward_engineering/utils/general.js @@ -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 || ''; }; @@ -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 }); };