Fixed issue with view schema when updating comments

Author: unknown

forward_engineering/helpers/alterScriptHelpers/ddlHelper.js

@@ -15,7 +15,18 @@ const getFullColumnName = (_) => (collection, columnName) => {
     return `${fullTableName}.${wrapInQuotes(columnName)}`;
 }
 
+const getFullViewName = (_) => (view) => {
+    const {getViewName} = require('../../utils/general')(_);
+    const {getNamePrefixedWithSchemaName} = require('../general')({_});
+
+    const viewSchema = {...view, ...(_.omit(view?.role, 'properties') || {})};
+    const viewName = getViewName(viewSchema);
+    const schemaName = viewSchema.compMod?.keyspaceName;
+    return getNamePrefixedWithSchemaName(viewName, schemaName);
+}
+
 module.exports = {
     getFullTableName,
     getFullColumnName,
+    getFullViewName,
 }

forward_engineering/helpers/alterScriptHelpers/viewHelpers/commentsHelper.js

@@ -1,3 +1,5 @@
+const {getFullViewName} = require("../ddlHelper");
+
 const extractDescription = (view) => {
     return view?.role?.compMod?.description || {};
 }
@@ -6,13 +8,13 @@ const extractDescription = (view) => {
  * @return (view: Object) => string
  * */
 const getUpsertCommentsScript = (_, ddlProvider) => (view) => {
-    const {wrapComment, wrapInQuotes} = require('../../general')({_});
+    const {wrapComment} = require('../../general')({_});
 
     const description = extractDescription(view);
     if (description.new && description.new !== description.old) {
         const wrappedComment = wrapComment(description.new);
-        const wrappedSchemaName = wrapInQuotes(view.role.name);
-        return ddlProvider.updateViewComment(wrappedSchemaName, wrappedComment);
+        const viewName = getFullViewName(_)(view);
+        return ddlProvider.updateViewComment(viewName, wrappedComment);
     }
     return '';
 }
@@ -21,12 +23,10 @@ const getUpsertCommentsScript = (_, ddlProvider) => (view) => {
  * @return (view: Object) => string
  * */
 const getDropCommentsScript = (_, ddlProvider) => (view) => {
-    const {wrapInQuotes} = require('../../general')({_});
-
     const description = extractDescription(view);
     if (description.old && !description.new) {
-        const wrappedSchemaName = wrapInQuotes(view.role.name);
-        return ddlProvider.dropViewComment(wrappedSchemaName);
+        const viewName = getFullViewName(_)(view);
+        return ddlProvider.dropViewComment(viewName);
     }
     return '';
 }

forward_engineering/utils/general.js

@@ -16,6 +16,10 @@ module.exports = _ => {
 		return (entityData && (entityData.code || entityData.collectionName)) || '';
 	};
 
+	const getViewName = view => {
+		return (view && (view.code || view.name)) || '';
+	};
+
 	const getDbData = containerData => {
 		return Object.assign({}, _.get(containerData, '[0]', {}), { name: getDbName(containerData) });
 	};
@@ -129,6 +133,7 @@ module.exports = _ => {
 		getDbName,
 		getDbData,
 		getEntityName,
+		getViewName,
 		getViewOn,
 		rejectRecursiveRelationships,
 		filterRecursiveRelationships,