From 293ef82fc6f7e96fd01bd11f08a248f1c0653223 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 18 Nov 2019 12:24:47 +0100
Subject: [PATCH] Use SqlBuilder
---
process/Campaign_lib/process.js | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index c364beebc0..a5bc33f35d 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -237,12 +237,13 @@ CampaignUtils.deleteCampaignStepData = function(pCampaignStepId)
let queries = [];
- db.updateData("CAMPAIGNSTEP", ["PREDECESSORSTEP_ID"], null, [""], "PREDECESSORSTEP_ID = '" + pCampaignStepId + "'")
+ newWhere("CAMPAIGNSTEP.PREDECESSORSTEP_ID", pCampaignStepId)
+ .updateData(true, ["PREDECESSORSTEP_ID"], null, [""]);
- queries.push(new Array("CAMPAIGNPARTICIPANTLOG", "CAMPAIGNSTEP_ID = '" + pCampaignStepId + "'"));
- queries.push(new Array("CAMPAIGNPARTICIPANT", "CAMPAIGNSTEP_ID = '" + pCampaignStepId + "'"));
- queries.push(new Array("CAMPAIGNCOST", "CAMPAIGNSTEP_ID = '" + pCampaignStepId + "'"));
- queries.push(new Array("CAMPAIGNSTEP", "CAMPAIGNSTEPID = '" + pCampaignStepId + "'"));
+ queries.push(new Array("CAMPAIGNPARTICIPANTLOG", newWhere("CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID", pCampaignStepId).build()));
+ queries.push(new Array("CAMPAIGNPARTICIPANT", newWhere("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", pCampaignStepId).build()));
+ queries.push(new Array("CAMPAIGNCOST", newWhere("CAMPAIGNCOST.CAMPAIGNSTEP_ID", pCampaignStepId).build()));
+ queries.push(new Array("CAMPAIGNSTEP", newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID", pCampaignStepId).build()));
db.deletes(queries)
}
@@ -260,9 +261,9 @@ CampaignUtils.deleteCampaignData = function(pCampaignId)
return;
let campaignStepIds = newSelect("CAMPAIGNSTEPID")
- .from("CAMPAIGNSTEP")
- .where("CAMPAIGNSTEP.CAMPAIGN_ID", pCampaignId)
- .arrayColumn();
+ .from("CAMPAIGNSTEP")
+ .where("CAMPAIGNSTEP.CAMPAIGN_ID", pCampaignId)
+ .arrayColumn();
campaignStepIds.forEach(function (campaignStepId)
{
@@ -270,8 +271,8 @@ CampaignUtils.deleteCampaignData = function(pCampaignId)
});
let campaignRelated = [];
- campaignRelated.push(new Array("CAMPAIGNCOST", "CAMPAIGN_ID = '" + pCampaignId + "'"));
- campaignRelated.push(new Array("CAMPAIGN", "CAMPAIGNID = '" + pCampaignId + "'"));
+ campaignRelated.push(new Array("CAMPAIGNCOST", newWhere("CAMPAIGNCOST.CAMPAIGN_ID", pCampaignId).build()));
+ campaignRelated.push(new Array("CAMPAIGN", newWhere("CAMPAIGN.CAMPAIGNID", pCampaignId).build()));
db.deletes(campaignRelated)
}
--
GitLab