Skip to content

HCK-14054: make parentheses optional in table properties #159

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
chulanovskyi-bs merged 2 commits into from
Dec 19, 2025
Merged

HCK-14054: make parentheses optional in table properties #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a32296c
HCK-14054: make parentheses optional in table properties
AlikRakhmonov Dec 19, 2025
df89649
Merge branch 'develop' into HCK-14054
chulanovskyi-bs Dec 19, 2025
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
17 changes: 7 additions & 10 deletions forward_engineering/helpers/alterScriptHelpers/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const _ = require('lodash');
const { stripParentheses } = require('../generalHelper');

const getDifferentItems = (newItems = [], oldItems = []) => {
const intersection = _.intersectionWith(newItems, oldItems, _.isEqual);
Expand All @@ -10,24 +11,20 @@ const getDifferentItems = (newItems = [], oldItems = []) => {

const hydrateTableProperties = ({ new: newItems, old: oldItems }, name, commentState) => {
const hydrateProperties = properties => (properties || '').split(',').map(prop => prop.trim());
const prepareProperties = properties =>
properties
.filter(Boolean)
.map(property => property.replace(/(\S+)=([\s\S]+)/, `'$1'='$2'`))
.join(',\n');
const prepareProperties = properties => properties.filter(Boolean).join(', ');

const isCommentChanged = !_.isEqual(commentState?.new, commentState?.old);
const addCommentProp = isCommentChanged && commentState?.new ? `comment=${commentState?.new}` : '';
const dropCommentProp = isCommentChanged && !commentState?.new ? `comment` : '';
const addCommentProp = isCommentChanged && commentState?.new ? `'comment'='${commentState?.new}'` : '';
const dropCommentProp = isCommentChanged && !commentState?.new ? `'comment'` : '';

const preparePropertiesName = properties =>
properties
.filter(Boolean)
.map(prop => `'${prop.replace(/(=\S+)/, '')}'`)
.map(prop => `${prop.split('=')[0]}`)
.join(', ');

const newHydrateItems = hydrateProperties(newItems);
const oldHydrateItems = hydrateProperties(oldItems);
const newHydrateItems = hydrateProperties(stripParentheses(newItems));
const oldHydrateItems = hydrateProperties(stripParentheses(oldItems));

const { add, drop } = getDifferentItems(newHydrateItems, oldHydrateItems);

Expand Down
15 changes: 15 additions & 0 deletions forward_engineering/helpers/generalHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,20 @@ const encodeStringLiteral = (str = '') => {

const isDeactivatedStatement = statement => statement.startsWith(BEFORE_DEACTIVATED_STATEMENT);

const stripParentheses = str => {
if (typeof str !== 'string') {
return str;
}
let result = str.trim();
if (result.startsWith('(')) {
result = result.slice(1);
}
if (result.endsWith(')')) {
result = result.slice(0, -1);
}
return result;
};

module.exports = {
buildStatement,
getName,
Expand All @@ -147,4 +161,5 @@ module.exports = {
removeRedundantTrailingCommaFromStatement,
encodeStringLiteral,
isDeactivatedStatement,
stripParentheses,
};
12 changes: 3 additions & 9 deletions forward_engineering/helpers/tableHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const {
commentDeactivatedInlineKeys,
removeRedundantTrailingCommaFromStatement,
encodeStringLiteral,
stripParentheses,
} = require('./generalHelper');
const { getColumnsStatement, getColumnStatementParts, getColumns } = require('./columnHelper');
const keyHelper = require('./keyHelper');
Expand Down Expand Up @@ -65,7 +66,7 @@ const getCreateStatement = ({
)(skewedStatement, skewedStatement)(rowFormatStatement, `ROW FORMAT ${rowFormatStatement}`)(
storedAsStatement,
storedAsStatement,
)(location, `LOCATION "${location}"`)(tableProperties, `TBLPROPERTIES ${tableProperties}`)(
)(location, `LOCATION "${location}"`)(tableProperties, `TBLPROPERTIES (${tableProperties})`)(
selectStatement,
`AS ${selectStatement}`,
)(true, ';')();
Expand Down Expand Up @@ -166,13 +167,6 @@ const removePartitions = (columns, partitions) => {
);
};

const prepareTableProperties = (tableProperties = '') => {
const regex = /^\((?<properties>[\s\S]*)\)$/;
const match = regex.exec(tableProperties);
const properties = match?.groups.properties || '';
return properties.trim() ? tableProperties : '';
};

const getSkewedKeyStatement = (skewedKeys, skewedOn, asDirectories, deactivatedColumnNames, isParentItemActivated) => {
const getStatement = keysString =>
`SKEWED BY (${keysString}) ON ${skewedOn} ${asDirectories ? 'STORED AS DIRECTORIES' : ''}`;
Expand Down Expand Up @@ -289,7 +283,7 @@ const getTableStatement = (
rowFormatStatement: getRowFormat(tableData),
storedAsStatement: getStoredAsStatement(tableData),
location: tableData.location,
tableProperties: prepareTableProperties(tableData.tableProperties),
tableProperties: stripParentheses(tableData.tableProperties),
selectStatement: '',
isActivated: isTableActivated,
ifNotExist: tableData.ifNotExist,
Expand Down