HCK-13868: HiveQL script generation options

forward_engineering/api.js

@@ -2,9 +2,9 @@
 
 const { GlueClient, CreateDatabaseCommand, CreateTableCommand, GetDatabasesCommand } = require('@aws-sdk/client-glue');
 const { hckFetchAwsSdkHttpHandler } = require('@hackolade/fetch');
-const { getApiStatements } = require('./helpers/awsCliScriptHelpers/applyToInstanceHelper');
-const { generateScript } = require('./helpers/generateScript');
-const { generateContainerScript } = require('./helpers/generateContainerScript');
+const { getApiStatements } = require('./awsCliScriptHelpers/applyToInstanceHelper');
+const { generateScript } = require('./generateScript');
+const { generateContainerScript } = require('./generateContainerScript');
 
 module.exports = {
 	generateScript,

forward_engineering/helpers/awsScriptHelper.js → forward_engineering/awsCliScriptHelpers/awsScriptHelper.js

@@ -1,6 +1,6 @@
 const { get } = require('lodash');
-const { getGlueDatabaseCreateStatement } = require('./awsCliScriptHelpers/glueDatabaseHeleper');
-const { getGlueTableCreateStatement } = require('./awsCliScriptHelpers/glueTableHelper');
+const { getGlueDatabaseCreateStatement } = require('./glueDatabaseHeleper');
+const { getGlueTableCreateStatement } = require('./glueTableHelper');
 
 const buildAWSCLIScript = (containerData, tableSchema) => {
 	const dbStatement = getGlueDatabaseCreateStatement(containerData[0]);

forward_engineering/helpers/awsCliScriptHelpers/glueColumnHelper.js → forward_engineering/awsCliScriptHelpers/glueColumnHelper.js

@@ -1,6 +1,6 @@
-const { getTypeByProperty, getUnionFromAllOf, getUnionFromOneOf } = require('../columnHelper');
+const { getTypeByProperty, getUnionFromAllOf, getUnionFromOneOf } = require('../hiveHelpers/helpers/columnHelper');
 
-const getGlueTableColumns = (properties = {}, oneOf, allOf) => {
+const getGlueTableColumns = (properties = {}, oneOf = null, allOf = null) => {
 	const unionColumns = getUnionColumns(allOf, oneOf);
 	const columns = Object.entries(properties)
 		.filter(([key, value]) => !value.compositePartitionKey)
@@ -23,7 +23,7 @@ const getGlueTableClusteringKeyColumns = (properties = {}) => {
 const getGlueTableSortingColumns = (sortingItems = [], properties = {}) => {
 	return sortingItems.map(item => {
 		const property = Object.entries(properties).find(([key, value]) => value.GUID === item.keyId);
-		const propertyName = property && property[0];
+		const propertyName = property?.[0];
 		return {
 			Column: propertyName,
 			SortOrder: item.type === 'ascending' ? 1 : 0,
@@ -34,7 +34,7 @@ const getGlueTableSortingColumns = (sortingItems = [], properties = {}) => {
 const mapColumn = (name, data) => {
 	return {
 		Name: name,
-		Type: getTypeByProperty(data),
+		Type: getTypeByProperty()(data),
 		Comment: data.comments,
 	};
 };
@@ -43,7 +43,7 @@ const getUnionColumns = (allOf, oneOf) => {
 	let columns = [];
 
 	if (Array.isArray(oneOf)) {
-		const unions = getUnionFromOneOf(getTypeByProperty)({ oneOf });
+		const unions = getUnionFromOneOf(getTypeByProperty())({ oneOf });
 		const oneOfColumns = Object.keys(unions).reduce((acc, typeName) => {
 			acc = [...acc, { Name: typeName, Type: unions[typeName] }];
 			return acc;
@@ -52,7 +52,7 @@ const getUnionColumns = (allOf, oneOf) => {
 	}
 
 	if (Array.isArray(allOf)) {
-		const unions = getUnionFromAllOf(getTypeByProperty)({ allOf });
+		const unions = getUnionFromAllOf(getTypeByProperty())({ allOf });
 
 		const allOfColumns = Object.keys(unions).reduce((acc, typeName) => {
 			acc = [...acc, { Name: typeName, Type: unions[typeName] }];

forward_engineering/helpers/awsCliScriptHelpers/glueTableHelper.js → forward_engineering/awsCliScriptHelpers/glueTableHelper.js

@@ -1,5 +1,5 @@
 const { CLI, CREATE_TABLE } = require('./cliConstants');
-const { TABLE_FORMAT } = require('../../../shared/constants');
+const { TABLE_FORMAT } = require('../../shared/constants');
 const {
 	getGlueTableColumns,
 	getGluePartitionKeyTableColumns,
@@ -47,15 +47,15 @@ const mapSerdeInfo = tableSchema => {
 	const serDeParameters = getSerDeParams(tableSchema.serDeParameters);
 	return {
 		SerializationLibrary: tableSchema.serDeLibrary,
-		Parameters: Object.assign({}, { paths }, serDeParameters),
+		Parameters: { paths, ...serDeParameters },
 	};
 };
 
 const getSerdePathParams = (parameterPaths = [], properties = {}) => {
 	return parameterPaths
 		.map(({ keyId }) => {
 			const property = Object.entries(properties).find(([key, value]) => value.GUID === keyId);
-			const propertyName = property && property[0];
+			const propertyName = property?.[0];
 			return propertyName;
 		})
 		.join(',');
@@ -78,7 +78,7 @@ const mapTableParameters = tableSchema => {
 			props.classification = tableSchema.classification.toLowerCase();
 		}
 		return props;
-	} catch (err) {
+	} catch {
 		return {};
 	}
 };