Merge pull request #43 from VitaliiBedletskyi/master

HCK-4009 Support extended ASCII characters
hackolade · Sep 22, 2023 · 78305cd · 78305cd
2 parents e1d7216 + d88536a
commit 78305cd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 24 deletions.
diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -10,7 +10,8 @@ const {
 	generateViewSelectStatement,
 	escapeQuotes,
 	clearEmptyStatements,
-	prepareConstraintName
+	prepareConstraintName,
+	wrapByBackticks
 } = require('./helpers/utils');
 
 module.exports = (baseProvider, options, app) => {
@@ -106,7 +107,7 @@ module.exports = (baseProvider, options, app) => {
 			const partitionsStatement = commentIfDeactivated(partitions, { isActivated: isPartitionActivated });
 
 			const foreignKeysConstraintsStatements = foreignKeyConstraints.map(({statement}) => statement)
-			const compositePkFieldsNamesList = primaryKey.flatMap(compositePK => compositePK?.compositePrimaryKey.map(({name: columnName}) => columnName))
+			const compositePkFieldsNamesList = primaryKey.flatMap(compositePK => compositePK?.compositePrimaryKey.map(key => wrapByBackticks(key.name)))
 			const compositePrimaryKeyOutlineConstraint = compositePkFieldsNamesList.length ? `PRIMARY KEY (${compositePkFieldsNamesList.join(', ')}) NOT ENFORCED`: ''
 			const foreignKeysConstraintsStatement = foreignKeysConstraintsStatements.join(',\n')
 			const statementsToAddInsideTable = [activatedColumns.join(',\n'), deActivatedColumns.join(',\n'), compositePrimaryKeyOutlineConstraint, foreignKeysConstraintsStatement]
@@ -143,12 +144,20 @@ module.exports = (baseProvider, options, app) => {
 
 			if (!viewData.materialized) {
 				if (isActivated && !allDeactivated) {
-					const activated = viewData.keys.filter(key => key.isActivated).map(key => (key.alias || key.name)).filter(Boolean);
-					const deActivated = viewData.keys.filter(key => !key.isActivated).map(key => (key.alias || key.name)).filter(Boolean);
+					const activated = viewData.keys
+						.filter(key => key.isActivated)
+						.map(key => (key.alias || key.name))
+						.filter(Boolean)
+						.map(wrapByBackticks);
+					const deActivated = viewData.keys
+						.filter(key => !key.isActivated)
+						.map(key => (key.alias || key.name))
+						.filter(Boolean)
+						.map(wrapByBackticks);
 
 					columns = activated.join(', ') + (deActivated.length ? `/* ${deActivated.join(', ')} */` : '');
 				} else {
-					columns = viewData.keys.map(key => (key.alias || key.name)).filter(Boolean).join(', ');
+					columns = viewData.keys.map(key => wrapByBackticks(key.alias || key.name)).filter(Boolean).join(', ');
 				}
 			}
 			const isPartitionActivated = isActivatedPartition({
@@ -480,8 +489,8 @@ module.exports = (baseProvider, options, app) => {
 		alterColumnOptions(tableName, columnName, description) {
 			return assignTemplates(templates.alterColumnOptions, {
 				description: escapeQuotes(description),
-				tableName,
-				columnName,
+				tableName: wrapByBackticks(tableName),
+				columnName: wrapByBackticks(columnName),
 			});
 		},
 
@@ -491,16 +500,16 @@ module.exports = (baseProvider, options, app) => {
 			);
 
 			return assignTemplates(templates.alterColumnType, {
-				columnName: columnDefinition.name,
+				columnName: wrapByBackticks(columnDefinition.name),
 				type: columnSchema,
-				tableName,
+				tableName: wrapByBackticks(columnDefinition.name),
 			});
 		},
 
 		alterColumnDropNotNull(tableName, columnName) {
 			return assignTemplates(templates.alterColumnDropNotNull, {
-				columnName,
-				tableName,
+				columnName: wrapByBackticks(columnName),
+				tableName: wrapByBackticks(columnName),
 			});
 		},
 
@@ -509,7 +518,7 @@ module.exports = (baseProvider, options, app) => {
 
 			return assignTemplates(templates.alterTableAddColumn, {
 				tableName: fullTableName,
-				column,
+				column: column,
 			});
 		},
 
@@ -518,7 +527,7 @@ module.exports = (baseProvider, options, app) => {
 
 			return assignTemplates(templates.alterTableDropColumn, {
 				tableName: fullTableName,
-				columnName,
+				columnName: wrapByBackticks(columnName),
 			});
 		},
 

diff --git a/forward_engineering/helpers/general.js b/forward_engineering/helpers/general.js
@@ -1,4 +1,4 @@
-const { escapeQuotes, getTimestamp } = require('./utils');
+const { escapeQuotes, getTimestamp, wrapByBackticks} = require('./utils');
 
 module.exports = app => {
 	const _ = app.require('lodash');
@@ -118,8 +118,8 @@ module.exports = app => {
 
 	const foreignKeysToString = keys => {
 		if (Array.isArray(keys)) {
-			const activatedKeys = keys.filter(key => _.get(key, 'isActivated', true)).map(key => key.name.trim());
-			const deactivatedKeys = keys.filter(key => !_.get(key, 'isActivated', true)).map(key => key.name.trim());
+			const activatedKeys = keys.filter(key => _.get(key, 'isActivated', true)).map(key => wrapByBackticks(key.name.trim()));
+			const deactivatedKeys = keys.filter(key => !_.get(key, 'isActivated', true)).map(key => wrapByBackticks(key.name.trim()));
 			const deactivatedKeysAsString = deactivatedKeys.length
 				? commentIfDeactivated(deactivatedKeys, { isActivated: false }, true)
 				: '';
@@ -130,7 +130,7 @@ module.exports = app => {
 	};
 
 	const foreignActiveKeysToString = keys => {
-		return keys.map(key => key.name.trim()).join(', ');
+		return keys.map(key => wrapByBackticks(key.name.trim())).join(', ');
 	};
 
 	return {

diff --git a/forward_engineering/helpers/utils.js b/forward_engineering/helpers/utils.js
@@ -2,6 +2,10 @@ const escapeQuotes = (str = '') => {
 	return str.replace(/(")/gi, '\\$1').replace(/\n/gi, '\\n');
 };
 
+const wrapByBackticks = (str = '') => {
+	return `\`${str}\``;
+}
+
 const getPartitioningByIngestionTime = (partitioningType) => {
 	if (!partitioningType) {
 		return '_PARTITIONDATE';
@@ -63,7 +67,7 @@ const getTablePartitioning = ({
 	}
 
 	if (partitioning === 'By time-unit column' && partitionTimeColumn) {
-		return `PARTITION BY DATE(${partitionTimeColumn})`;
+		return `PARTITION BY DATE(${wrapByBackticks(partitionTimeColumn)})`;
 	}
 
 	if (partitioning === 'By integer-range') {
@@ -84,11 +88,11 @@ const getClusteringKey = (clusteringKey, isParentActivated) => {
 		return '';
 	}
 
-	const activated = clusteringKey.filter(key => key.isActivated).map(key => key.name).join(', ');
-	const deActivated = clusteringKey.filter(key => !key.isActivated).map(key => key.name).join(', ');
+	const activated = clusteringKey.filter(key => key.isActivated).map(key => wrapByBackticks(key.name)).join(', ');
+	const deActivated = clusteringKey.filter(key => !key.isActivated).map(key => wrapByBackticks(key.name)).join(', ');
 
 	if (!isParentActivated) {
-		return '\nCLUSTER BY ' + clusteringKey.map(key => key.name).join(', ');
+		return '\nCLUSTER BY ' + clusteringKey.map(key => wrapByBackticks(key.name)).join(', ');
 	}
 
 	if (activated.length === 0) {
@@ -288,7 +292,7 @@ const getColumnSchema = (deps) => ({ type, description, dataTypeMode, name, json
 	}
 
 	return assignTemplates(templates.columnDefinition, {
-		name,
+		name: name && wrapByBackticks(name),
 		type: dataType,
 		primaryKey,
 		notNull,
@@ -298,7 +302,7 @@ const getColumnSchema = (deps) => ({ type, description, dataTypeMode, name, json
 
 const generateViewSelectStatement = (getFullName, isActivated) => ({ columns, projectId, datasetName }) => {
 	const keys = columns.reduce((tables, key) => {
-		let column = key.name;
+		let column = wrapByBackticks(key.name);
 
 		if (key.alias) {
 			column = `${column} as ${key.alias}`;
@@ -353,4 +357,5 @@ module.exports = {
 	escapeQuotes,
 	clearEmptyStatements,
 	prepareConstraintName,
+	wrapByBackticks,
 };
diff --git a/validation/validationRegularExpressions.json b/validation/validationRegularExpressions.json
@@ -1,3 +1,2 @@
 {
-	"name": "^[A-Za-z_][A-Za-z0-9_]{0,299}$"
 }