FE: fix missing selectStatement property during RE (#107)

* FE: fix missing selectStatement property during RE * FE: fix incorrect new line position for semicolon after select statement
hackolade · Dec 21, 2023 · 2dafc66 · 2dafc66
1 parent eb2aa15
commit 2dafc66
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/forward_engineering/configs/templates.js b/forward_engineering/configs/templates.js
@@ -25,7 +25,7 @@ module.exports = {
 	createView:
 		'CREATE${secure}${materialized} VIEW IF NOT EXISTS ${name} (\n' +
 		'\t${column_list}\n' +
-		')\n${copy_grants}${comment}AS ${select_statement}',
+		')\n${copy_grants}${comment}AS ${select_statement};\n',
 	createUDF:
 		"CREATE${orReplace} FUNCTION ${name}(${arguments})\n\tRETURNS ${returnType}${notNull}\n\tLANGUAGE ${language}${parameters}${comment}\n\tAS ${body};\n",
 	createProcedure:

diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -449,7 +449,7 @@ module.exports = (baseProvider, options, app) => {
 
 			const selectStatement =
 				viewData.selectStatement ||
-				`SELECT \n\t${viewColumnsToString(tableColumns, isActivated)}\nFROM ${tables.join(' INNER JOIN ')};\n`;
+				`SELECT \n\t${viewColumnsToString(tableColumns, isActivated)}\nFROM ${tables.join(' INNER JOIN ')}`;
 
 			return assignTemplates(templates.createView, {
 				secure: viewData.secure ? ' SECURE' : '',

diff --git a/reverse_engineering/api.js b/reverse_engineering/api.js
@@ -151,7 +151,8 @@ const getDbCollectionsData = async (data, logger, cb, app) => {
 					data: viewData,
 					ddl: {
 						script: ddl,
-						type: 'snowflake'
+						type: 'snowflake',
+						takeAllDdlProperties: true,
 					}
 				};
 			}));