Skip to content

HCK-14288: Escape comment only when it has special chars #182

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
Vitalii4as merged 5 commits into from
Jan 16, 2026
Merged

HCK-14288: Escape comment only when it has special chars #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c58c8c8
HCK-14275: generate SQL for view column comment
AlikRakhmonov Jan 14, 2026
4dae4df
HCK-14288: Escape comment only when it has special chars
AlikRakhmonov Jan 15, 2026
0ff968b
fix
AlikRakhmonov Jan 15, 2026
54ffcba
Merge branch 'develop' into HCK-14288
AlikRakhmonov Jan 15, 2026
1eb1015
fix
AlikRakhmonov Jan 16, 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
4 changes: 2 additions & 2 deletions forward_engineering/alterScript/alterScriptFromDeltaHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ const getAlterViewScriptDtos = (collection, app) => {
const modifyScriptsData = getItemProperties(viewsData?.modified);

const createViewsScriptDtos = getItemProperties(viewsData?.added)
.map(view => ({ ...view, ..._.omit(view.role, 'properties') }))
.map(view => ({ ...view, ...view.role }))
.filter(view => view.compMod?.created)
.map(getAddViewScriptDto(app));

const deleteViewsScriptDtos = getItemProperties(viewsData?.deleted)
.map(view => ({ ...view, ..._.omit(view.role, 'properties') }))
.map(view => ({ ...view, ...view.role }))
.map(getDeleteViewScriptDto(app));

const modifyViewsScriptDtos = modifyScriptsData
Expand Down
17 changes: 14 additions & 3 deletions forward_engineering/utils/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@ const _ = require('lodash');
const { AlterCollectionDto, AlterCollectionRoleDto } = require('../alterScript/types/AlterCollectionDto');
const { ReservedWordsAsArray } = require('../enums/reservedWords');

const MUST_BE_ESCAPED = /[\t\n'\f\r]/gm;
const MUST_BE_ESCAPED = /[\t\n'\\\f\r]/gm;
const ESCAPE_MAP = {
'\n': '\\n',
'\t': '\\t',
'\r': '\\r',
'\f': '\\f',
'\\': '\\\\',
"'": "\\'",
};

const getDbName = containerData => {
return _.get(containerData, '[0].code') || _.get(containerData, '[0].name', '');
Expand Down Expand Up @@ -161,9 +169,12 @@ const getDbVersion = (dbVersion = '') => {
return Number(_.get(version, [0], 0));
};

const prepareComment = (comment = '') => comment.replace(MUST_BE_ESCAPED, character => `\\${character}`);
const prepareComment = (comment = '') => comment.replaceAll(MUST_BE_ESCAPED, ch => ESCAPE_MAP[ch]);

const wrapComment = comment => `E'${prepareComment(JSON.stringify(comment)).slice(1, -1)}'`;
const wrapComment = (comment = '') => {
const shouldBeEscaped = MUST_BE_ESCAPED.test(comment);
return shouldBeEscaped ? `E'${prepareComment(comment)}'` : `'${comment}'`;
};

const getFunctionArguments = functionArguments => {
return _.map(functionArguments, arg => {
Expand Down