From 10fb6b25002b92e909e60789d5ba6b20e0fe5b91 Mon Sep 17 00:00:00 2001 From: yevhenii-moroziuk Date: Wed, 28 Jan 2026 01:20:03 +0200 Subject: [PATCH] HCK-14476: Remove schema name from new table --- .../entityHelpers/alterTableNameHelper.js | 6 ++---- .../src/main/java/org/db2/Db2Service.java | 2 +- shared/addons/Db2Client.jar | Bin 4301463 -> 4301475 bytes 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js index d39adf1..c1770e3 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/alterTableNameHelper.js @@ -5,6 +5,7 @@ const { getSchemaOfAlterCollection, getSchemaNameFromCollection, getNamePrefixedWithSchemaName, + wrapInQuotes, } = require('../../../utils/general'); const { assignTemplates } = require('../../../utils/assignTemplates'); const templates = require('../../../ddlProvider/templates'); @@ -40,10 +41,7 @@ const getRenameTableScriptDtos = collection => { const isContainerActivated = isParentContainerActivated(collection); const isCollectionActivated = isContainerActivated && isObjectInDeltaModelActivated(collection); - const script = alterTableName( - getNamePrefixedWithSchemaName({ name: oldName, schemaName }), - getNamePrefixedWithSchemaName({ name: newName, schemaName }), - ); + const script = alterTableName(getNamePrefixedWithSchemaName({ name: oldName, schemaName }), wrapInQuotes(newName)); return [AlterScriptDto.getInstance([script], isCollectionActivated, false)]; }; diff --git a/shared/Db2Client/src/main/java/org/db2/Db2Service.java b/shared/Db2Client/src/main/java/org/db2/Db2Service.java index 55b7aec..1062443 100644 --- a/shared/Db2Client/src/main/java/org/db2/Db2Service.java +++ b/shared/Db2Client/src/main/java/org/db2/Db2Service.java @@ -74,7 +74,7 @@ public int applyScript(String script) throws SQLException { } private String removeComments(String script) { - return script.replaceAll("(?s)(?m)(?<=\\n)(?:/\\*.*?\\*/|--.*?$)(?=\\n)", ""); + return script.replaceAll("(?s)(?m)(?:^|(?<=\\n))(?:/\\*.*?\\*/|--.*?)(?=\\n|$)", ""); } private String[] splitStatements(String query) { diff --git a/shared/addons/Db2Client.jar b/shared/addons/Db2Client.jar index 62923b827c9cf39ddd765a6d0d784e3ec0b70c87..b44c3d66b00b70646f3b2f33e887611f867d7b49 100644 GIT binary patch delta 3872 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 E0Kb;}fdBvi