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
33 changes: 25 additions & 8 deletions forward_engineering/alterScript/alterScriptFromDeltaHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const {
getAddForeignKeyScriptDtos,
getModifyForeignKeyScriptDtos,
} = require('./alterScriptHelpers/alterForeignKeyHelper');
const { getModifyViewScriptDtos } = require('./alterScriptHelpers/alterViewHelper');
const { getViewsScripts } = require('./alterScriptHelpers/alterViewHelper');

/**
* @param {T} data
Expand Down Expand Up @@ -100,8 +100,8 @@ const getAlterCollectionScriptDtos = ({
return [
...deletedCollectionScriptDtos,
...addedCollectionScriptDtos,
...modifyCollectionScriptDtos,
...deletedColumnScriptDtos,
...modifyCollectionScriptDtos,
...addedColumnScriptDtos,
...modifyColumnScriptDtos,
...modifyCollectionKeysScriptDtos,
Expand All @@ -110,15 +110,32 @@ const getAlterCollectionScriptDtos = ({

/**
* @param {Object} collection
* @param {App} app
* @return {Array<AlterScriptDto>}
*/
const getAlterViewScriptDtos = collection => {
const modifyViewScriptDtos = getItems(collection.properties?.views?.properties?.modified)
.map(viewWrapper => Object.values(viewWrapper.properties)[0])
const getAlterViewScriptDtos = (collection, app) => {
const { added, deleted, modified } = collection.properties?.views?.properties || {};
const { getAddViewScriptDto, getDeleteViewScriptDto, getModifyViewScriptDtos } = getViewsScripts(app);

const addedViews = getItems(added)
.map(item => Object.values(item.properties)[0])
.map(view => ({ ...view, ...view.role }))
.flatMap(getModifyViewScriptDtos);
.filter(view => view.compMod?.created);

const deletedViews = getItems(deleted)
.map(item => Object.values(item.properties)[0])
.map(view => ({ ...view, ...view.role }))
.filter(view => view.compMod?.deleted);

const modifiedViews = getItems(modified)
.map(item => Object.values(item.properties)[0])
.map(view => ({ ...view, ...view.role }));

const addedViewScriptDtos = addedViews.map(getAddViewScriptDto);
const deletedViewScriptDtos = deletedViews.map(getDeleteViewScriptDto);
const modifyViewScriptDtos = modifiedViews.flatMap(getModifyViewScriptDtos);

return [...modifyViewScriptDtos].filter(Boolean);
return [...deletedViewScriptDtos, ...addedViewScriptDtos, ...modifyViewScriptDtos].filter(Boolean);
};

/**
Expand Down Expand Up @@ -238,7 +255,7 @@ const getAlterScriptDtos = (data, app) => {
inlineDeltaRelationships,
});

const viewScriptDtos = getAlterViewScriptDtos(collection);
const viewScriptDtos = getAlterViewScriptDtos(collection, app);

const relationshipScriptDtos = getAlterRelationshipsScriptDtos({
collection,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const {
} = require('../../utils/general');
const { getRelationshipName } = require('./alterForeignKeyHelper');
const { createColumnDefinitionBySchema } = require('./createColumnDefinition');
const { getRenameTableScriptDtos } = require('./entityHelpers/alterTableNameHelper');

/**
* @param {Object} ddlProvider
Expand Down Expand Up @@ -99,9 +100,12 @@ const getDeleteCollectionScriptDto = ddlProvider => collection => {
* @returns {Array<AlterScriptDto>}
*/
const getModifyCollectionScriptDtos = collection => {
const modifyCollectionNameScriptDtos = getRenameTableScriptDtos(collection);
const modifyCheckConstraintScriptDtos = getModifyCheckConstraintScriptDtos(collection);
const modifyCommentScriptDtos = getModifyEntityCommentsScriptDtos(collection);
return [...modifyCheckConstraintScriptDtos, ...modifyCommentScriptDtos].filter(Boolean);
return [...modifyCollectionNameScriptDtos, ...modifyCheckConstraintScriptDtos, ...modifyCommentScriptDtos].filter(
Boolean,
);
};

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,64 @@
/**
* @typedef {import('../../../shared/types').App} App
*/
const { getModifyViewCommentsScriptDtos } = require('./viewHelpers/commentsHelper');
const { getRenameViewScriptDtos } = require('./viewHelpers/alterNameHelper');
const { AlterScriptDto } = require('../types/AlterScriptDto');
const { getSchemaOfAlterCollection } = require('../../utils/general');
const { createView, dropView } = require('./viewHelpers/createDropViewHelper');
const { getModifySelectStatementScriptDtos } = require('./viewHelpers/alterViewStatementHelper');

const getModifyViewScriptDtos = view => {
/**
* @param {Object} ddlProvider
* @param {Function} mapProperties
* @returns {(view: Object) => AlterScriptDto}
*/
const getAddViewScriptDto = (ddlProvider, mapProperties) => view => {
const script = createView({ ddlProvider, mapProperties, view });

return AlterScriptDto.getInstance([script], true, false);
};

/**
* @param {Object} ddlProvider
* @returns {(view: Object) => AlterScriptDto}
*/
const getDeleteViewScriptDto = ddlProvider => view => {
const viewSchema = getSchemaOfAlterCollection(view);
const script = dropView({ ddlProvider, viewSchema });

return AlterScriptDto.getInstance([script], true, true);
};

/**
* @param {Object} ddlProvider
* @param {Function} mapProperties
* @returns {(view: Object) => Array<AlterScriptDto>}
*/
const getModifyViewScriptDtos = (ddlProvider, mapProperties) => view => {
const renameViewNameScriptDtos = getRenameViewScriptDtos(view, ddlProvider, mapProperties);
const modifySelectStatementScriptDtos = getModifySelectStatementScriptDtos(view, ddlProvider, mapProperties);
const modifyCommentsScriptDtos = getModifyViewCommentsScriptDtos(view);

return [...modifyCommentsScriptDtos].filter(Boolean);
return [...renameViewNameScriptDtos, ...modifySelectStatementScriptDtos, ...modifyCommentsScriptDtos].filter(
Boolean,
);
};

/**
* @param {App} app
*/
const getViewsScripts = app => {
const ddlProvider = require('../../ddlProvider/ddlProvider')(null, null, app);
const { mapProperties } = app.require('@hackolade/ddl-fe-utils');

return {
getAddViewScriptDto: getAddViewScriptDto(ddlProvider, mapProperties),
getDeleteViewScriptDto: getDeleteViewScriptDto(ddlProvider),
getModifyViewScriptDtos: getModifyViewScriptDtos(ddlProvider, mapProperties),
};
};

module.exports = {
getModifyViewScriptDtos,
getViewsScripts,
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ const {
getSchemaOfAlterCollection,
getFullCollectionName,
} = require('../../../utils/general');
const { getColumnCommentStatement } = require('../../../ddlProvider/ddlHelpers/comment/commentHelper');
const {
getColumnCommentStatement,
dropTableColumnCommentStatement,
} = require('../../../ddlProvider/ddlHelpers/comment/commentHelper');

const getUpdatedCommentOnColumnScriptDtos = collection => {
const isContainerActivated = isParentContainerActivated(collection);
Expand Down Expand Up @@ -46,7 +49,7 @@ const getDeletedCommentOnColumnScriptDtos = collection => {
})
.map(([columnName, jsonSchema]) => {
const isActivated = isContainerActivated && isCollectionActivated && jsonSchema.isActivated;
const script = getColumnCommentStatement({ tableName, columnName, description: '' });
const script = dropTableColumnCommentStatement({ tableName, columnName });

return { script, isActivated };
})
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
const { AlterScriptDto } = require('../../types/AlterScriptDto');
const {
isParentContainerActivated,
isObjectInDeltaModelActivated,
getSchemaOfAlterCollection,
getSchemaNameFromCollection,
getNamePrefixedWithSchemaName,
} = require('../../../utils/general');
const { assignTemplates } = require('../../../utils/assignTemplates');
const templates = require('../../../ddlProvider/templates');

/**
* @param {string} oldTableName
* @param {string} newTableName
* @return string
*/
const alterTableName = (oldTableName, newTableName) => {
return assignTemplates({ template: templates.renameTable, templateData: { oldTableName, newTableName } });
};

/**
* @param {Object} collection
* @returns {Array<AlterScriptDto>}
*/
const getRenameTableScriptDtos = collection => {
const collectionSchema = getSchemaOfAlterCollection(collection);
const tableName = collectionSchema?.compMod?.collectionName;

if (!tableName) {
return [];
}

const { old: oldName, new: newName } = tableName;

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

const schemaName = getSchemaNameFromCollection({ collection: collectionSchema });
const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);

const script = alterTableName(
getNamePrefixedWithSchemaName({ name: oldName, schemaName }),
getNamePrefixedWithSchemaName({ name: newName, schemaName }),
);

return [AlterScriptDto.getInstance([script], isCollectionActivated, false)];
};

module.exports = {
getRenameTableScriptDtos,
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ const {
getSchemaOfAlterCollection,
getFullCollectionName,
} = require('../../../utils/general');
const { getTableCommentStatement } = require('../../../ddlProvider/ddlHelpers/comment/commentHelper');
const {
getTableCommentStatement,
dropTableCommentStatement,
} = require('../../../ddlProvider/ddlHelpers/comment/commentHelper');

const getUpdatedCommentOnCollectionScriptDto = collection => {
const descriptionInfo = collection?.role.compMod?.description;
Expand Down Expand Up @@ -46,7 +49,7 @@ const getDeletedCommentOnCollectionScriptDto = collection => {
const isContainerActivated = isParentContainerActivated(collection);
const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection);

const script = getTableCommentStatement({ tableName, description: '' });
const script = dropTableCommentStatement({ tableName });
return AlterScriptDto.getInstance([script], isCollectionActivated, true);
};

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
const { AlterScriptDto } = require('../../types/AlterScriptDto');
const { getSchemaOfAlterCollection } = require('../../../utils/general');
const { createView, dropView } = require('./createDropViewHelper');

/**
* @param {Object} view
* @param {Object} ddlProvider
* @param {Function} mapProperties
* @return {AlterScriptDto | undefined}
*/
const getRenameViewScriptDtos = (view, ddlProvider, mapProperties) => {
const viewSchema = getSchemaOfAlterCollection(view);
const viewName = viewSchema?.compMod?.name;

if (!viewName) {
return [undefined];
}

const { old: oldName, new: newName } = viewName;

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

const dropScript = dropView({
ddlProvider,
viewSchema: { ...viewSchema, code: oldName, name: oldName },
});
const createScript = createView({ ddlProvider, mapProperties, view });

return [
AlterScriptDto.getInstance([dropScript], true, true),
AlterScriptDto.getInstance([createScript], true, false),
];
};

module.exports = {
getRenameViewScriptDtos,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const { getSchemaOfAlterCollection } = require('../../../utils/general');
const { AlterScriptDto } = require('../../types/AlterScriptDto');
const { createView, dropView } = require('./createDropViewHelper');

/**
* @param {Object} view
* @param {Object} ddlProvider
* @param {Function} mapProperties
* @returns {AlterScriptDto | undefined}
*/
const getModifySelectStatementScriptDtos = (view, ddlProvider, mapProperties) => {
const viewSchema = getSchemaOfAlterCollection(view);
const selectStatement = viewSchema?.compMod?.selectStatement || {};

if ((!selectStatement.new && !selectStatement.old) || selectStatement.new === selectStatement.old) {
return [undefined];
}

const dropScript = dropView({ viewSchema, ddlProvider });
const createScript = createView({ ddlProvider, mapProperties, view });

return [
AlterScriptDto.getInstance([dropScript], true, true),
AlterScriptDto.getInstance([createScript], true, false),
];
};

module.exports = {
getModifySelectStatementScriptDtos,
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ const {
getFullCollectionName,
getSchemaOfAlterCollection,
} = require('../../../utils/general');
const { getTableCommentStatement } = require('../../../ddlProvider/ddlHelpers/comment/commentHelper');
const {
getTableCommentStatement,
dropTableCommentStatement,
} = require('../../../ddlProvider/ddlHelpers/comment/commentHelper');

const extractDescription = view => {
return view?.role?.compMod?.description || {};
Expand Down Expand Up @@ -39,7 +42,7 @@ const getDropCommentsScriptDto = view => {
const isContainerActivated = isParentContainerActivated(view);
const isViewActivated = isContainerActivated && isObjectInDeltaModelActivated(view);

const script = getTableCommentStatement({ tableName: viewName, description: '' });
const script = dropTableCommentStatement({ tableName: viewName });
return AlterScriptDto.getInstance([script], isViewActivated, true);
}
return undefined;
Expand Down
Loading