diff --git a/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js index 3a0b46b8b1fe9519eeec33585163ca74d1a2ebab..4e7b2c6977df58da8b15cd8a6c61b1c602c16f35 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 4727ac92281bcd2d31273ffa81fe95efe7a12786..52962aa1f6bbab7fb9b2e5c50cd7954fe377caca 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 07c84afdbee221f02ce2bddf07d7daa980774214..08cfe20b63ade03abbf75c5a8817b0f96059437e 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 2366e6b5af77b5ba73399379f2f2d2c14fe88c1b..10a51f29306e076043cbfeb6122bf8df6ed99a06 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 a367023d23685e3bd9590be36b5e0e793de93298..f9ed4ba049025f57f20ed0bfb26fe15c0f2690c3 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 d1828d0358625806df67ba07c992a6895f60b5d6..ccfcde13ce112db94776dfcb587206bb0aea5dc6 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 98728cf49abc577ec16ae328b5fe1aec3c980ef2..892ed53b3e815ba9bc00dd562b43f1c06fe7781b 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 fd8efc5e55400e54d155278eabb1daf14db7e5bb..c9400e2255c4ec752d4be18e2d0d0ddfe10992ad 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 5fdc9fb6c34ca9533b4bbf052e586d6f6226c608..372f85e353234519d6dd386b16772edb0b5d6c95 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 31639afe38fc1c35b729b59fd89c7c96b2b68738..e645f7a4aa67bdb71c03361840943f8e9ebfff2a 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 fd420916d9172146ce5f60943ae629bf8578cd82..aed60d38cbdb1ccf856de1f22d558ece50c1a88c 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); }