From edca932533a8ddadabae7fabc8ccce20072a7ad8 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 19 Dec 2024 13:04:34 +0100 Subject: [PATCH 1/2] HCK-9173: comment out inactive schema statement in script --- forward_engineering/ddlProvider/ddlProvider.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index 1aa953e..5d60226 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -67,7 +67,7 @@ module.exports = (baseProvider, options, app) => { }); }, - createSchema({ schemaName, ifNotExist, comments, udfs, procedures }) { + createSchema({ schemaName, ifNotExist, comments, udfs, procedures, sequences, isActivated }) { const comment = assignTemplates(templates.comment, { object: 'SCHEMA', objectName: wrapInQuotes(schemaName), @@ -83,12 +83,14 @@ module.exports = (baseProvider, options, app) => { const createFunctionStatement = getFunctionsScript(schemaName, udfs); const createProceduresStatement = getProceduresScript(schemaName, procedures); - return _.chain([schemaStatement, createFunctionStatement, createProceduresStatement]) + const statement = _.chain([schemaStatement, createFunctionStatement, createProceduresStatement]) .compact() .map(_.trim) .join('\n\n') .trim() .value(); + + return commentIfDeactivated(statement, { isActivated }); }, createTable( @@ -667,6 +669,7 @@ module.exports = (baseProvider, options, app) => { procedures: data?.procedures || [], sequences: data?.sequences || [], dbVersion, + isActivated: containerData.isActivated, }; }, From c436a9eeb59e3f4df668353f4b9c041db6136995 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 19 Dec 2024 16:51:58 +0100 Subject: [PATCH 2/2] fix undefined --- forward_engineering/ddlProvider/ddlProvider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index 5d60226..1b5e567 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -67,7 +67,7 @@ module.exports = (baseProvider, options, app) => { }); }, - createSchema({ schemaName, ifNotExist, comments, udfs, procedures, sequences, isActivated }) { + createSchema({ schemaName, ifNotExist, comments, udfs, procedures, sequences, isActivated = true }) { const comment = assignTemplates(templates.comment, { object: 'SCHEMA', objectName: wrapInQuotes(schemaName),