SqlCondition.translate instead of db.translateCondition(SqlCondition.build())

entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js

+import("system.logging");
 import("system.vars");
 import("system.db");
 import("system.result");
@@ -6,5 +7,5 @@ import("Sql_lib");
 var cond = SqlCondition.begin()
                        .andPrepareVars("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param");
 
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 0")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 0"));
\ No newline at end of file

entity/Activity_entity/recordcontainers/db/conditionProcess.js

@@ -41,7 +41,7 @@ if (loadNothing)
 }
 else
 {
-    //TODO: use a preparedCondition when available #1030812 #1034026
-    var resCond = db.translateCondition(cond.build("1 = 1"));
+    //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+    var resCond = cond.translate("1 = 1");
 }
 result.string(resCond);
\ No newline at end of file

entity/Address_entity/conditionProcess.js

@@ -2,4 +2,5 @@ import("Sql_lib");
 import("system.db");
 import("system.result");
 
-result.string(db.translateCondition(SqlCondition.begin().andPrepareVars("ADDRESS.CONTACT_ID", "$param.ContactId_param").build("1=1")));  
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(SqlCondition.begin().andPrepareVars("ADDRESS.CONTACT_ID", "$param.ContactId_param").translate("1=1"));  

entity/Address_entity/recordcontainers/db/conditionProcess.js

@@ -17,6 +17,5 @@ if (organisationId)
     cond.orPrepare("ADDRESS.CONTACT_ID", organisationContactId);
 }
 
-cond = cond.build("1 = 2");
-cond = db.translateCondition(cond);
-result.string(cond);
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 2"));
\ No newline at end of file

entity/AnyContact_entity/recordcontainers/db/conditionProcess.js

@@ -30,4 +30,5 @@ var cond = SqlCondition.begin()
                        .andSqlCondition(conditionPrivateOrganisation)
                        .andPrepareIfSet("CONTACT.ORGANISATION_ID", orgContactId);
 
-result.string(db.translateCondition(cond.build()));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate());
\ No newline at end of file

entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js

@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = SqlCondition.begin()
                        .andPrepareVars("AB_APPOINTMENTLINK.APPOINTMENT_ID", "$param.AppointmentId_param")
 
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 1"));
\ No newline at end of file

entity/Appointment_entity/recordcontainers/jdito/contentProcess.js

@@ -14,7 +14,6 @@ import("system.entities")
 
 var cond = SqlCondition.begin();
 var appointmentUids;
-var idscond;
 
 if(vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
 {
@@ -27,9 +26,8 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
     var contactid = EmployeeUtils.getCurrentContactId();
     
     cond.andPrepareIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
-    idscond = db.translateCondition(cond.build("1 = 1"));
-   
-    appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+
+    appointmentUids = db.table(cond.buildSql("select APPOINTMENT_ID from AB_APPOINTMENTLINK"));
     result.object(buildEntriesFromUids(appointmentUids));
 }
 
@@ -39,9 +37,8 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
 else if(vars.getString("$param.LinkedObjectId_param") != undefined)
 {
     cond.andPrepareVars("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
-    idscond = db.translateCondition(cond.build("1 = 1"));
    
-    appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+    appointmentUids = db.table(cond.buildSql("select APPOINTMENT_ID from AB_APPOINTMENTLINK"));
     result.object(buildEntriesFromUids(appointmentUids));
 }
 /**

entity/Appointment_entity/recordcontainers/jdito/onDelete.js

@@ -20,7 +20,6 @@ if (vars.exists("$param.Entry_param"))
      */
     var cond = SqlCondition.begin();
     cond.andPrepareIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
-    var idscond = db.translateCondition(cond.build("1 = 2"));
     
-    db.deleteData("AB_APPOINTMENTLINK", idscond);
+    db.deleteData("AB_APPOINTMENTLINK", cond.build("1 = 2"));
 }
\ No newline at end of file

entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js

@@ -2,6 +2,7 @@ import("Sql_lib");
 import("system.db");
 import("system.result");
 
-result.string(db.translateCondition(SqlCondition.begin()
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(SqlCondition.begin()
         .andPrepareVars("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", "$param.AttributeId_param")
-        .build("1=2")));  
+        .translate("1=2"));  

entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js

@@ -4,5 +4,6 @@ import("Sql_lib");
 
 var condition = SqlCondition.begin()
     .andPrepareVars("BULKMAILRECIPIENT.BULKMAIL_ID", "$param.BulkMailId_param");
-    
-result.string(db.translateCondition(condition.build("1=1")));
\ No newline at end of file
+
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(condition.translate("1=1"));
\ No newline at end of file

entity/CampaignCost_entity/recordcontainers/db/conditionProcess.js

@@ -19,4 +19,5 @@ else
     cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is null");
 }
 
-result.string(db.translateCondition(cond.build("1=2")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1=2"));
\ No newline at end of file

entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js

@@ -8,5 +8,5 @@ var cond = SqlCondition.begin()
 
 cond.andPrepareIfSet("CAMPAIGNSTEP.SORTING", vars.getString("$param.maxSort_param"), "# <= ?");
 
-
-result.string(db.translateCondition(cond.build("1=1")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1=1"));
\ No newline at end of file

entity/Campaign_entity/recordcontainers/db/conditionProcess.js

@@ -6,6 +6,6 @@ import("system.vars");
 
 if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
-    //TODO: use a preparedCondition when available #1030812 #1034026
+    //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
     result.string("CAMPAIGN.EMPLOYEE_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");
 }
\ No newline at end of file

entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js

@@ -37,8 +37,8 @@ if (vars.exists("$local.filter") && vars.get("$local.filter"))
 
 var masking = new SqlMaskingUtils();
 result.object(db.table(cond.buildSql("select CLASSIFICATIONTYPEID, CLASSIFICATIONID, CLASSIFICATIONGROUP, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE from CLASSIFICATION \n\
-                right join CLASSIFICATIONTYPE on " + db.translateCondition(SqlCondition.begin()
+                right join CLASSIFICATIONTYPE on " + SqlCondition.begin()
                     .and("CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID")
                     .andPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
-                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").build()), "1=1", "order by CLASSIFICATIONGROUP asc"))
+                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").translate(), "1=1", "order by CLASSIFICATIONGROUP asc"))
                 );
\ No newline at end of file

entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js

@@ -3,6 +3,7 @@ import("Sql_lib");
 import("system.db");
 import("system.result");
 
-result.string(db.translateCondition(SqlCondition.begin()
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(SqlCondition.begin()
                   .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", "$param.ClassificationTypeId_param")
-                  .build("1=2")));
\ No newline at end of file
+                  .translate("1=2"));
\ No newline at end of file

entity/Classification_entity/recordcontainers/jdito/contentProcess.js

@@ -49,10 +49,10 @@ if (vars.exists("$local.filter") && vars.get("$local.filter"))
 
 var masking = new SqlMaskingUtils();
 result.object(db.table(cond.buildSql("select case when CLASSIFICATIONID is not null then " + masking.concat(["'C,'", "CLASSIFICATIONID"], "", false) + " else " + masking.concat(["'T,'", "CLASSIFICATIONTYPEID"], "", false) + " end, CLASSIFICATIONID, CLASSIFICATIONGROUP, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE from CLASSIFICATION \n\
-                right join CLASSIFICATIONTYPE on " + db.translateCondition(SqlCondition.begin()
+                right join CLASSIFICATIONTYPE on " + SqlCondition.begin()
                     .and("CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID")
                     .andPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
-                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").build()), "1=2", "order by CLASSIFICATIONGROUP asc"))
+                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").translate(), "1=2", "order by CLASSIFICATIONGROUP asc"))
                 .map(function(pRow)
                 {
                     pRow.push(scores);

entity/CommRestriction_Entity/recordcontainers/db/conditionProcess.js

@@ -5,5 +5,5 @@ import("Sql_lib");
 var cond = new SqlCondition();
 cond.andPrepareVars("COMMRESTRICTION.CONTACT_ID", "$param.ContactId_param");
 
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 1"));
\ No newline at end of file

entity/Communication_entity/recordcontainers/db/conditionProcess.js

@@ -14,4 +14,5 @@ if (vars.exists("$param.CommMediumIds_param"))
     if(mediumIds.length > 0) 
         cond.andIn("COMMUNICATION.MEDIUM_ID", mediumIds);
 }
-result.string(db.translateCondition(cond.build("1 = 2")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 2"));
\ No newline at end of file

entity/Competition_entity/recordcontainers/db/conditionProcess.js

@@ -6,6 +6,5 @@ var cond = new SqlCondition();
 cond.andPrepareVars("COMPETITION.OBJECT_ROWID", "$param.ObjectRowId_param"),
 cond.andPrepareVars("COMPETITION.OBJECT_TYPE", "$param.ObjectType_param");
 
-//TODO: use a preparedCondition when available #1030812 #1034026
-
-result.string(db.translateCondition(cond.build("1 = 1")));
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 1"));

entity/Contact_entity/recordcontainers/db/conditionProcess.js

@@ -7,5 +7,5 @@ var cond = new SqlCondition();
 cond.andPrepareVars("CONTACT.CONTACTID", "$param.OwnContactId_param", "# != ?");
 cond.andPrepareVars("CONTACT.PERSON_ID", "$param.PersonId_param");
 
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 2")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1 = 2"));
\ No newline at end of file