Skip to content

HCK-10313: dbt - fix empty array type structure #110

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
Mar 20, 2025
Merged

HCK-10313: dbt - fix empty array type structure #110

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
a73f92d
HCK-10313: fix empty array type structure
serhii-filonenko Mar 18, 2025
03b397f
fix typo
serhii-filonenko Mar 18, 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
3 changes: 1 addition & 2 deletions forward_engineering/dbtProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ class DbtProvider {
*/
decorateType({ columnDefinition }) {
const type = columnHelper.getTypeByProperty([], '')(columnDefinition);
const isComplexType = /^(array|struct)/i.test(type);

return isComplexType ? type.replace(/<[\s\S]+>$/, '<>') : type;
return columnHelper.clearComplexStructure({ type });
}

/**
Expand Down
21 changes: 21 additions & 0 deletions forward_engineering/helpers/columnHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,30 @@ const getDescription = (definitions, property) => {
return property.refDescription || property.description || definitionDescription;
};

/**
* @param {{ type: string }}
* @returns {string}
*/
const clearComplexStructure = ({ type }) => {
const isArray = /^array/i.test(type);
const isStruct = /^struct/i.test(type);
const isComplexType = isArray || isStruct;

if (!isComplexType) {
return type;
}

const structureRegExp = /<([\s\S]+)>$/;
const [, subType] = structureRegExp.exec(type) ?? ['', ''];
const structure = isArray ? clearComplexStructure({ type: subType }) : '';

return type.replace(structureRegExp, () => `<${structure}>`);
};

module.exports = {
getColumns,
getColumnsStatement,
getColumnStatement,
getTypeByProperty,
clearComplexStructure,
};