From caeba1219e099c0e83fa7ea1b7ff30b8cc9028cb Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 10 Jan 2020 11:38:11 +0100
Subject: [PATCH] SqlBuilder usage
---
.../recordcontainers/db/conditionProcess.js | 7 ++-----
.../LeadLog_entity/recordcontainers/db/conditionProcess.js | 7 ++-----
.../recordcontainers/db/conditionProcess.js | 7 ++-----
entity/Lead_entity/recordcontainers/db/conditionProcess.js | 7 ++-----
process/AttributeFilter_lib/process.js | 2 +-
5 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/entity/ImportField_Entity/recordcontainers/db/conditionProcess.js b/entity/ImportField_Entity/recordcontainers/db/conditionProcess.js
index 91a535f508..869f9d26a1 100644
--- a/entity/ImportField_Entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ImportField_Entity/recordcontainers/db/conditionProcess.js
@@ -1,7 +1,4 @@
-import("system.vars");
-import("system.db");
import("system.result");
import("Sql_lib");
-var cond = new SqlCondition();
-cond.andPrepareVars("IMPORTFIELD.LEADIMPORT_ID", "$param.LeadImportID");
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+
+result.string(newWhere("IMPORTFIELD.LEADIMPORT_ID", "$param.LeadImportID").toString());
\ No newline at end of file
diff --git a/entity/LeadLog_entity/recordcontainers/db/conditionProcess.js b/entity/LeadLog_entity/recordcontainers/db/conditionProcess.js
index 5eb5fee1d8..f5bdf487c8 100644
--- a/entity/LeadLog_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/LeadLog_entity/recordcontainers/db/conditionProcess.js
@@ -1,7 +1,4 @@
-import("system.vars");
-import("system.db");
import("system.result");
import("Sql_lib");
-var cond = new SqlCondition();
-cond.andPrepareVars("LEADLOG.LEADIMPORT_ID", "$param.LeadImportId");
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+
+result.string(newWhere("LEADLOG.LEADIMPORT_ID", "$param.LeadImportId").toString());
\ No newline at end of file
diff --git a/entity/LeadTemp_entity/recordcontainers/db/conditionProcess.js b/entity/LeadTemp_entity/recordcontainers/db/conditionProcess.js
index 6c4d4fff78..cab716e8dd 100644
--- a/entity/LeadTemp_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/LeadTemp_entity/recordcontainers/db/conditionProcess.js
@@ -1,7 +1,4 @@
-import("system.vars");
-import("system.db");
import("system.result");
import("Sql_lib");
-var cond = new SqlCondition();
-cond.andPrepareVars("LEADTEMP.ROW_ID", "$param.LeadImportId");
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+
+result.string(newWhere("LEADTEMP.ROW_ID", "$param.LeadImportId").toString());
\ No newline at end of file
diff --git a/entity/Lead_entity/recordcontainers/db/conditionProcess.js b/entity/Lead_entity/recordcontainers/db/conditionProcess.js
index 728c5aa134..fe9e31415a 100644
--- a/entity/Lead_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Lead_entity/recordcontainers/db/conditionProcess.js
@@ -1,7 +1,4 @@
-import("system.vars");
-import("system.db");
import("system.result");
import("Sql_lib");
-var cond = new SqlCondition();
-cond.andPrepareVars("LEAD.LEADIMPORT_ID", "$param.LeadImportId");
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+
+result.string(newWhere("LEAD.LEADIMPORT_ID", "$param.LeadImportId").toString());
\ No newline at end of file
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index 2427bdf5db..8bf6eff6f9 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -127,7 +127,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
var condition = pCondition;
if (attributeType == $AttributeTypes.BOOLEAN.toString())
- condition = newWhere(["AB_ATTRIBUTERELATION", dbField], pRawValue, pOperatorName == "LIKE" ? SqlBuilder.EQUAL() : SqlBuilder.NOT_EQUAL());
+ condition = newWhere(["AB_ATTRIBUTERELATION", dbField], SqlUtils.escapeVars(pRawValue), pOperatorName == "LIKE" ? SqlBuilder.EQUAL() : SqlBuilder.NOT_EQUAL());
else
{
condition = pCondition;
--
GitLab