From 8144d4f50abbc47762816ebcc131336cf9a610dc Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 5 Mar 2021 13:29:46 +0100
Subject: [PATCH] #1075044 Hardcoded Data_alias changed to db.getCurrentAlias()
where it's possible
---
.../entityfields/checklistentry_id/displayValueProcess.js | 6 +++++-
.../recordcontainers/jdito/contentProcess.js | 2 +-
.../entityfields/drop_action/onActionProcess.js | 2 +-
process/EwsClientSync_lib/process.js | 5 +++--
process/KeywordData_lib/process.js | 4 ++--
process/Loghistory_lib/process.js | 2 +-
process/MSTeams_lib/process.js | 3 ++-
process/Neon_lib/process.js | 2 +-
process/PermissionCalendar_lib/process.js | 2 +-
process/Workflow_lib/process.js | 3 ++-
process/ewsSyncContacts_serverProcess/process.js | 4 ++--
11 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js
index 3a0b46b8b1..4e7b2c6977 100644
--- a/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js
+++ b/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js
@@ -1,13 +1,17 @@
+import("system.db");
import("system.result");
import("system.vars");
import("system.translate");
import("ChecklistEntryRegistry_basic");
import("Util_lib");
import("Sql_lib");
+
+
+var alias = db.getCurrentAlias();
var checklistEntryId = vars.get("$field.CHECKLISTENTRY_ID");
-var verfierFnName = newSelect("TITLE", "Data_alias")
+var verfierFnName = newSelect("TITLE", alias)
.from("CHECKLISTENTRY")
.where("CHECKLISTENTRY.CHECKLISTENTRYID", checklistEntryId)
.cell();
diff --git a/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
index 4727ac9228..52962aa1f6 100644
--- a/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
@@ -91,5 +91,5 @@ for (i = 0; i < checklistEntries.length; i++)
}
}
-db.inserts(preparedStatements, "Data_alias");
+db.inserts(preparedStatements, db.getCurrentAlias());
result.object(checklistEntryValues);
\ No newline at end of file
diff --git a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
index 07c84afdbe..08cfe20b63 100644
--- a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
+++ b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
@@ -9,7 +9,7 @@ import("system.process");
import("system.project");
import("system.plugin");
-var dbAlias = "Data_alias";
+var dbAlias = "Data_alias"; //hardcoded because of a lack of a recordcontainer
var files = vars.get("$local.value");
var status = {
activitiesCreated: 0,
diff --git a/process/EwsClientSync_lib/process.js b/process/EwsClientSync_lib/process.js
index 2366e6b5af..10a51f2930 100644
--- a/process/EwsClientSync_lib/process.js
+++ b/process/EwsClientSync_lib/process.js
@@ -107,8 +107,9 @@ EwsClientSyncUtils.prepareContactSyncTable = function(){
}
try{
- let count = db.inserts(statements, "Data_alias");
- let updCount = db.updates(updStatements, "Data_alias");
+ let alias = db.getCurrentAlias();
+ let count = db.inserts(statements, alias);
+ let updCount = db.updates(updStatements, alias);
}
catch(exc){
logging.log(exc)
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index a367023d23..f9ed4ba049 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -22,7 +22,7 @@ KeywordData.getSimpleData = function(pKeywordContainer, pLocale, pOnlyActives)
var cache = new CachedData(identifier, true, pLocale);
return cache.load(function(pTranslationNecessary, pLocale) {
- var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias")
+ var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias") //Data_alias necessary due to calles from both system- and data-alias
.from("AB_KEYWORD_ENTRY")
.orderBy("AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
.where("AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID", KeywordUtils.getCategoryIdByName(pKeywordContainer));
@@ -48,7 +48,7 @@ KeywordData.getSimpleData2 = function(pKeywordContainer, pLocale, pOnlyActives)
var cache = new CachedData(identifier, true, pLocale);
return cache.load(function(pTranslationNecessary, pLocale) {
- var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias")
+ var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias") //Data_alias necessary due to calles from both system- and data-alias
.from("AB_KEYWORD_ENTRY")
.join("AB_KEYWORD_CATEGORY", "AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID = AB_KEYWORD_CATEGORY.AB_KEYWORD_CATEGORYID")
.orderBy("AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
diff --git a/process/Loghistory_lib/process.js b/process/Loghistory_lib/process.js
index d1828d0358..ccfcde13ce 100644
--- a/process/Loghistory_lib/process.js
+++ b/process/Loghistory_lib/process.js
@@ -36,7 +36,7 @@ import("system.entities");
*/
function LogHistoryExecutor(pTable, pUser, pColumns, pNewValues, pOldValues, pTimeStamp, pAction, pIdValue)
{
- this.structureDefinitionAlias = "Data_alias";//alias where the definition of what shall be logged is stored
+ this.structureDefinitionAlias = db.getCurrentAlias();//alias where the definition of what shall be logged is stored
this.oldValues = pOldValues || [];
this.newValues = pNewValues || [];
this.affectedTable = pTable.toUpperCase();
diff --git a/process/MSTeams_lib/process.js b/process/MSTeams_lib/process.js
index 98728cf49a..892ed53b3e 100644
--- a/process/MSTeams_lib/process.js
+++ b/process/MSTeams_lib/process.js
@@ -1,3 +1,4 @@
+import("system.db");
import("system.logging");
import("system.neon");
import("Util_lib");
@@ -308,7 +309,7 @@ MSTeamsUtils.isUserTeamOwner = function (pTeamId, pUserId)
*/
MSTeamsUtils.getTeamInfo = function (pTeamId)
{
- var teamInfo = new SqlBuilder("Data_alias")
+ var teamInfo = new SqlBuilder(db.getCurrentAlias())
.select(["TEAMNAME", "WEB_URL", "SERVICE_URL", "IS_ARCHIVED", "GENERAL_CHANNELID"])
.from("MST_TEAM")
.whereIfSet("MST_TEAM.MST_TEAMID", pTeamId)
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index fd8efc5e55..c9400e2255 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -86,7 +86,7 @@ CopyModuleUtils.openNewModules = function(pNeonContext, pModulesMapping)
*/
CopyModuleUtils.copyModule = function(pInputMapping)
{
- var AliasDefinitionStructure = project.getAliasDefinitionStructure("Data_alias", null);
+ var AliasDefinitionStructure = project.getAliasDefinitionStructure(db.getCurrentAlias(), null);
var ModulesMapping = {};
var statements = [];
diff --git a/process/PermissionCalendar_lib/process.js b/process/PermissionCalendar_lib/process.js
index 5fdc9fb6c3..372f85e353 100644
--- a/process/PermissionCalendar_lib/process.js
+++ b/process/PermissionCalendar_lib/process.js
@@ -30,7 +30,7 @@ function PermissionCalendar(){}
PermissionCalendar.getAlias = function()
{
- return "Data_alias";
+ return db.getCurrentAlias();
};
/**
diff --git a/process/Workflow_lib/process.js b/process/Workflow_lib/process.js
index 31639afe38..e645f7a4aa 100644
--- a/process/Workflow_lib/process.js
+++ b/process/Workflow_lib/process.js
@@ -1,3 +1,4 @@
+import("system.db");
import("Employee_lib");
import("system.process");
import("Util_lib");
@@ -235,7 +236,7 @@ WorkflowSignalSender.eventHappened = function (pEvent, pTargetId, pTargetContext
*/
WorkflowSignalSender.getSignalConfig = function (pContext, pEvent)
{
- var signals = newSelect("SIGNAL_NAME, TRIGGER_EVENT, OBJECT_CONDITION, OBJECT_TYPE, VARIABLES", "Data_alias")
+ var signals = newSelect("SIGNAL_NAME, TRIGGER_EVENT, OBJECT_CONDITION, OBJECT_TYPE, VARIABLES", db.getCurrentAlias())
.from("WORKFLOWSIGNAL")
.whereIfSet("WORKFLOWSIGNAL.OBJECT_TYPE", pContext)
.andIfSet("WORKFLOWSIGNAL.TRIGGER_EVENT", pEvent)
diff --git a/process/ewsSyncContacts_serverProcess/process.js b/process/ewsSyncContacts_serverProcess/process.js
index fd420916d9..aed60d38cb 100644
--- a/process/ewsSyncContacts_serverProcess/process.js
+++ b/process/ewsSyncContacts_serverProcess/process.js
@@ -291,7 +291,7 @@ function EWSupdateContactsForUser(pUserID, pMailBox, pAlias, pRunDate, pUser, do
if(deletes.length > 0)
{
//delete out of sync table
- db.deleteData("AB_SYNCCONTACT", " CONTACT_ID in ('" + deletes.join("', '") + "') and USER_ID = '" + pUserID + "'", "Data_alias", 300000);
+ db.deleteData("AB_SYNCCONTACT", " CONTACT_ID in ('" + deletes.join("', '") + "') and USER_ID = '" + pUserID + "'", db.getCurrentAlias(), 300000);
//remove set favorite for those which are delted - otherwise they would appear in the next run as 'new' Contacts
EwsClientSyncUtils.removeFromFavorite(deletes, pUserID);
@@ -584,5 +584,5 @@ function updateADITOContactsAfterAction(pUpdateValues, pUserID)
cond = "CONTACT_ID = '" + pUpdateValues[i][0] + "' and USER_ID = '" + pUserID + "'";
updArr.push(["AB_SYNCCONTACT", cols, types, vals, cond]);
}
- db.updates(updArr, "Data_alias", 300000);
+ db.updates(updArr, db.getCurrentAlias(), 300000);
}
--
GitLab