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
36 changes: 27 additions & 9 deletions forward_engineering/alterScript/alterScriptFromDeltaHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,35 @@ const getAlterViewScriptDtos = (collection, app) => {
.map(view => ({ ...view, ...view.role }))
.map(getDeleteViewScriptDto(app));

const modifyViewsScriptDtos = modifyScriptsData
const preparedModifyViewsScriptDtos = modifyScriptsData
.map(view => ({ ...view, ..._.omit(view.role, 'properties') }))
.flatMap(getModifyViewScriptDtos);
.reduce(
(scripts, view) => {
const { restViewScripts, renameViewScripts } = getModifyViewScriptDtos(view);

if (restViewScripts.length) {
scripts.restViewScripts.push(...restViewScripts);
}
if (renameViewScripts.length) {
scripts.renameViewScripts.push(...renameViewScripts);
}

return scripts;
},
{ restViewScripts: [], renameViewScripts: [] },
);

const modifyCommentScriptDtos = modifyScriptsData.flatMap(getModifiedCommentOnColumnScriptDtos);

return [
...deleteViewsScriptDtos,
...createViewsScriptDtos,
...modifyViewsScriptDtos,
...modifyCommentScriptDtos,
].filter(Boolean);
return {
renameViewScripts: preparedModifyViewsScriptDtos.renameViewScripts,
restViewScripts: [
...deleteViewsScriptDtos,
...createViewsScriptDtos,
...preparedModifyViewsScriptDtos.restViewScripts,
...modifyCommentScriptDtos,
].filter(Boolean),
};
};

/**
Expand Down Expand Up @@ -437,9 +454,10 @@ const getAlterScriptDtos = (data, app) => {
return [
...containersScriptDtos,
...modelDefinitionsScriptDtos,
...viewScriptDtos.renameViewScripts,
...collectionsScriptDtos,
...containersSequencesScriptDtos,
...viewScriptDtos,
...viewScriptDtos.restViewScripts,
...relationshipScriptDtos,
].filter(Boolean);
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const _ = require('lodash');
const { getModifyViewCommentsScriptDtos } = require('./viewHelpers/commentsHelper');
const { getRenameViewScriptDtos } = require('./viewHelpers/nameHelper');
const { AlterScriptDto, SCRIPT_TYPE } = require('../types/AlterScriptDto');
const { wrapInQuotes, getId } = require('../../utils/general');

Expand Down Expand Up @@ -80,9 +81,13 @@ const getDeleteViewScriptDto = app => view => {
* @return {AlterScriptDto[]}
* */
const getModifyViewScriptDtos = view => {
const renameViewScriptDtos = getRenameViewScriptDtos(view);
const modifyCommentsScriptDtos = getModifyViewCommentsScriptDtos(view);

return [...modifyCommentsScriptDtos].filter(Boolean);
return {
renameViewScripts: renameViewScriptDtos.filter(Boolean),
restViewScripts: modifyCommentsScriptDtos.filter(Boolean),
};
};

module.exports = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
const { AlterScriptDto, SCRIPT_TYPE } = require('../../types/AlterScriptDto');
const {
getViewName,
getNamePrefixedWithSchemaName,
wrapInQuotes,
isParentContainerActivated,
isObjectInDeltaModelActivated,
getId,
} = require('../../../utils/general');
const assignTemplates = require('../../../utils/assignTemplates');
const templates = require('../../../ddlProvider/templates');

const getDdlName = ({ code, name } = {}) => code || name || '';

const valueBeforeChange = (change, currentValue) => {
if (change && change.old !== change.new) {
return change.old;
}

return currentValue;
};

/**
* @param {Object} view
* @return {AlterScriptDto | undefined}
*/
const getRenameViewScriptDto = view => {
const role = view?.role;
const viewSchema = { ...view, ...role };
const compMod = { ...view?.compMod, ...role?.compMod };
const newName = getViewName(viewSchema);
const oldName = getDdlName({
code: valueBeforeChange(compMod.code, viewSchema.code),
name: valueBeforeChange(compMod.name, viewSchema.name),
});

if (!oldName || !newName || oldName === newName) {
return;
}

const script = assignTemplates(templates.renameView, {
viewName: getNamePrefixedWithSchemaName(oldName, compMod.keyspaceName),
newName: wrapInQuotes(newName),
});
const isContainerActivated = isParentContainerActivated(view);
const isViewActivated = isContainerActivated && isObjectInDeltaModelActivated(view);

return AlterScriptDto.getInstance(script, isViewActivated, false, SCRIPT_TYPE.alterView, getId(view));
};

/**
* @param {Object} view
* @return {AlterScriptDto[]}
*/
const getRenameViewScriptDtos = view => {
return [getRenameViewScriptDto(view)].filter(Boolean);
};

module.exports = {
getRenameViewScriptDtos,
};
8 changes: 8 additions & 0 deletions forward_engineering/alterScript/types/AlterCollectionDto.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,14 @@ class AlterCollectionRoleCompModDto {
*/
code;

/**
* @type {{
* new: string,
* old: string,
* }}
*/
name;

/**
* @type {{
* new: boolean,
Expand Down
2 changes: 2 additions & 0 deletions forward_engineering/ddlProvider/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ module.exports = {

renameTable: 'ALTER TABLE IF EXISTS ${tableName} RENAME TO ${newName};',

renameView: 'ALTER VIEW IF EXISTS ${viewName} RENAME TO ${newName};',

addCheckConstraint:
'ALTER TABLE IF EXISTS ${tableName} ADD CONSTRAINT ${constraintName} CHECK (${expression})${noInherit};',

Expand Down
Loading