fix: upgrade sql-formatter lib

forward_engineering/hiveHelpers/generateContainerScript.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const sqlFormatter = require('sql-formatter');
 const foreignKeyHelper = require('./helpers/foreignKeyHelper');
 const { getDatabaseStatement } = require('./helpers/databaseHelper');
 const { getAlterScript } = require('./helpers/alterScriptFromDeltaHelper');
@@ -69,7 +68,7 @@ const generateContainerScript = (data, logger, callback, app) => {
 		if (data.isUpdateScript) {
 			const deltaModelSchema = _.first(Object.values(jsonSchema)) || {};
 			const definitions = [modelDefinitions, internalDefinitions, externalDefinitions];
-			const scripts = getAlterScript(deltaModelSchema, definitions, data, app, needMinify, sqlFormatter);
+			const scripts = getAlterScript(deltaModelSchema, definitions, data, app, needMinify);
 			callback(null, scripts);
 			return;
 		}

forward_engineering/hiveHelpers/generateScript.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const sqlFormatter = require('sql-formatter');
 const { getAlterScript } = require('./helpers/alterScriptFromDeltaHelper');
 const { getDatabaseStatement } = require('./helpers/databaseHelper');
 const { getTableStatement } = require('./helpers/tableHelper');
@@ -21,7 +20,7 @@ const generateScript = (data, logger, callback, app) => {
 
 		if (data.isUpdateScript) {
 			const definitions = [modelDefinitions, internalDefinitions, externalDefinitions];
-			const scripts = getAlterScript(jsonSchema, definitions, data, app, needMinify, sqlFormatter);
+			const scripts = getAlterScript(jsonSchema, definitions, data, app, needMinify);
 			callback(null, scripts);
 			return;
 		}

forward_engineering/hiveHelpers/helpers/alterScriptFromDeltaHelper.js

@@ -19,6 +19,7 @@ const {
 } = require('./alterScriptHelpers/alterViewHelper');
 const { getItems } = require('./alterScriptHelpers/common');
 const { getContainerName } = require('./alterScriptHelpers/generalHelper');
+const { buildScript } = require('./buildScript');
 const { DROP_STATEMENTS } = require('./constants');
 const { commentDeactivatedStatements, prepareName } = require('./generalHelper');
 
@@ -190,7 +191,7 @@ const getInlineRelationships = ({ schema, options }) => {
 	return addedRelationships;
 };
 
-const getAlterScript = (schema, definitions, data, app, needMinify, sqlFormatter) => {
+const getAlterScript = (schema, definitions, data, app, needMinify) => {
 	const provider = require('./alterScriptHelpers/provider')(app);
 
 	const inlineDeltaRelationships = getInlineRelationships({ schema, options: data.options });
@@ -235,7 +236,7 @@ const getAlterScript = (schema, definitions, data, app, needMinify, sqlFormatter
 		.filter(Boolean)
 		.map(script => script.trim());
 	scripts = getCommentedDropScript(scripts, data);
-	return builds(scripts, needMinify, sqlFormatter);
+	return buildScript(needMinify)(...scripts);
 };
 
 const getCommentedDropScript = (scripts, data) => {
@@ -250,18 +251,6 @@ const getCommentedDropScript = (scripts, data) => {
 	});
 };
 
-const builds = (scripts, needMinify, sqlFormatter) => {
-	const prepareScripts = scripts.filter(Boolean).join('\n\n');
-	if (needMinify) {
-		return prepareScripts;
-	}
-	const formatScripts = sqlFormatter.format(scripts.filter(Boolean).join('\n\n'), { indent: '    ' });
-	return formatScripts
-		.split(';')
-		.map(script => script.trim())
-		.join(';\n\n');
-};
-
 module.exports = {
 	getAlterScript,
 };

forward_engineering/hiveHelpers/helpers/buildScript.js

@@ -1,14 +1,24 @@
 const sqlFormatter = require('sql-formatter');
 
+const tryFormat = statement => {
+	try {
+		// Fails for complex types https://github.com/sql-formatter-org/sql-formatter/issues/735
+		return sqlFormatter.format(statement, { language: 'spark', tabWidth: 4, linesBetweenQueries: 2 });
+	} catch {
+		return statement;
+	}
+};
+
 const buildScript =
 	needMinify =>
 	(...statements) => {
-		const script = statements.filter(statement => statement).join('\n\n');
 		if (needMinify) {
-			return script;
+			return statements.filter(Boolean).join('\n\n');
 		}
 
-		return sqlFormatter.format(script, { language: 'spark', indent: '    ', linesBetweenQueries: 2 }) + '\n';
+		const script = statements.filter(Boolean).map(tryFormat).join('\n\n');
+
+		return script + '\n';
 	};
 
 module.exports = {

package.json

@@ -46,7 +46,7 @@
         "@hackolade/fetch": "1.1.0",
         "antlr4": "4.8.0",
         "lodash": "4.17.21",
-        "sql-formatter": "4.0.2"
+        "sql-formatter": "15.6.12"
     },
     "lint-staged": {
         "*.{js,json}": "prettier --write"