HCK-7254: fix FE script generation for the time unit partitioning usi…

…ng DATE type column
hackolade · Jul 16, 2024 · f6862d5 · f6862d5
1 parent a527ec9
commit f6862d5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -78,6 +78,7 @@ module.exports = (baseProvider, options, app) => {
 				externalTableOptions,
 				foreignKeyConstraints,
 				primaryKey,
+				properties,
 			},
 			isActivated,
 		) {
@@ -95,6 +96,7 @@ module.exports = (baseProvider, options, app) => {
 				partitioningType,
 				timeUnitPartitionKey,
 				rangeOptions,
+				properties,
 			});
 			const clustering = getClusteringKey(clusteringKey, isActivated);
 			const isExternal = tableType === 'External';
@@ -205,6 +207,7 @@ module.exports = (baseProvider, options, app) => {
 				partitioningType: viewData.partitioningType,
 				timeUnitPartitionKey: viewData.timeUnitPartitionKey,
 				rangeOptions: viewData.rangeOptions,
+				properties: viewData.properties,
 			});
 			const clustering = getClusteringKey(viewData.clusteringKey, isActivated);
 			const partitionsStatement = commentIfDeactivated(partitions, { isActivated: isPartitionActivated });
@@ -422,6 +425,7 @@ module.exports = (baseProvider, options, app) => {
 						},
 					}[tableOptions.format] || {},
 				),
+				properties: jsonSchema.properties,
 			};
 		},
 
@@ -434,7 +438,7 @@ module.exports = (baseProvider, options, app) => {
 			};
 		},
 
-		hydrateView({ viewData, entityData }) {
+		hydrateView({ viewData, entityData, jsonSchema }) {
 			const detailsTab = entityData[0];
 
 			return {
@@ -458,6 +462,7 @@ module.exports = (baseProvider, options, app) => {
 				enableRefresh: detailsTab.enableRefresh,
 				maxStaleness: detailsTab.maxStaleness,
 				allowNonIncrementalDefinition: detailsTab.allowNonIncrementalDefinition,
+				properties: jsonSchema.properties,
 			};
 		},
 

diff --git a/forward_engineering/helpers/utils.js b/forward_engineering/helpers/utils.js
@@ -35,6 +35,14 @@ const getPartitioningByIntegerRange = (rangeOptions = {}) => {
 	return `RANGE_BUCKET(${name}, GENERATE_ARRAY(${start}, ${end}${isNaN(interval) ? '' : `, ${interval}`}))`;
 };
 
+const getPartitioningByTimeUnitColumn = ({ partitionTimeColumn, properties }) => {
+	if (properties?.[partitionTimeColumn]?.type === 'date') {
+		return wrapByBackticks(partitionTimeColumn);
+	}
+
+	return `DATE(${wrapByBackticks(partitionTimeColumn)})`;
+};
+
 const isActivatedPartition = ({ partitioning, timeUnitPartitionKey, rangeOptions }) => {
 	if (partitioning === 'By time-unit column') {
 		return timeUnitPartitionKey?.[0]?.isActivated;
@@ -47,7 +55,7 @@ const isActivatedPartition = ({ partitioning, timeUnitPartitionKey, rangeOptions
 	return true;
 };
 
-const getTablePartitioning = ({ partitioning, partitioningType, timeUnitPartitionKey, rangeOptions }) => {
+const getTablePartitioning = ({ partitioning, partitioningType, timeUnitPartitionKey, rangeOptions, properties }) => {
 	const partitionTimeColumn = timeUnitPartitionKey?.[0]?.name;
 
 	if (partitioning === 'No partitioning') {
@@ -59,7 +67,7 @@ const getTablePartitioning = ({ partitioning, partitioningType, timeUnitPartitio
 	}
 
 	if (partitioning === 'By time-unit column' && partitionTimeColumn) {
-		return `PARTITION BY DATE(${wrapByBackticks(partitionTimeColumn)})`;
+		return 'PARTITION BY ' + getPartitioningByTimeUnitColumn({ partitionTimeColumn, properties });
 	}
 
 	if (partitioning === 'By integer-range') {