Skip to content

HCK-14816-expect-clause-formatting #321

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
serhii-filonenko merged 2 commits into from
Feb 13, 2026
Merged

HCK-14816-expect-clause-formatting #321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf681e3
HCK-14816-expect-clause-formatting
ivan-m-dev Feb 13, 2026
661fb0e
Merge branch 'develop' into HCK-14816-expect-clause-formatting
serhii-filonenko Feb 13, 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
16 changes: 13 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 @@ -190,10 +190,20 @@ const wrapInBrackets = (str = '') => {
* @param statements {Array<string>}
* */
const buildScript = statements => {
const FAIL_UPDATE_TOKEN = 'FAIL_UPDATE_GUARD_TOKEN';

const nonEmptyScripts = statements.filter(statement => statement);
const formattedScripts = nonEmptyScripts.map(script =>
sqlFormatter.format(script, { indent: ' ', linesBetweenQueries: 2 }).replace(/\{ \{ (.+?) } }/g, '{{$1}}'),
);
const formattedScripts = nonEmptyScripts.map(script => {
// We need to replace "FAIL UPDATE" with a guard token before formatting the script,
// because the SQL formatter doesn't recognize "FAIL UPDATE" as a valid syntax and breaks it,
// while "FAIL_UPDATE_GUARD_TOKEN" is not a valid SQL syntax and will be left unchanged by the formatter.
const protectedScript = script.replaceAll(/FAIL\s+UPDATE/gi, FAIL_UPDATE_TOKEN);

return sqlFormatter
.format(protectedScript, { indent: ' ', linesBetweenQueries: 2 })
.replace(/\{ \{ (.+?) } }/g, '{{$1}}')
.replaceAll(FAIL_UPDATE_TOKEN, 'FAIL UPDATE');
});

return formattedScripts.join('\n\n') + '\n\n';
};
Expand Down