first usages of the new builder in basic

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/bulkmail/entityfields/documenttemplate_id/customproperties/translate4log/property.js

@@ -5,8 +5,9 @@ import("system.result");
 import("Loghistory_lib");
 
 var params = Translate4LogParams.load();
-var res = db.cell(SqlCondition.begin()
-    .andPrepare("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", params.value)
-    .buildSql("select NAME from DOCUMENTTEMPLATE", "1=2"));
+var res = newSelect("NAME")
+            .from("DOCUMENTTEMPLATE")
+            .where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", params.value)
+            .cell();
     
 result.string(res);

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/serialletter/entityfields/documenttemplate_id/customproperties/translate4log/property.js

@@ -5,8 +5,9 @@ import("system.result");
 import("Loghistory_lib");
 
 var params = Translate4LogParams.load();
-var res = db.cell(SqlCondition.begin()
-    .andPrepare("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", params.value)
-    .buildSql("select NAME from DOCUMENTTEMPLATE", "1=2"));
+var res = newSelect("NAME ")
+            .from("DOCUMENTTEMPLATE")
+            .where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", params.value)
+            .cell();
     
 result.string(res);

aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js

@@ -12,7 +12,7 @@ queryCondition = "";
 if (vars.exists("$local.idvalue")) {
     affectedIds = vars.get("$local.idvalue");
     queryCondition = "where SALESORDERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?) ----> use SqlCondition Lib
+    //TODO: refactor this for incremental indexer (injections?) ----> use SqlBuilder Lib
 }
 sqlHelper = new SqlMaskingUtils();
 sqlQuery = "select SALESORDERID, " 

entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js

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

entity/Activity_entity/recordcontainers/db/conditionProcess.js

@@ -5,7 +5,7 @@ import("system.result");
 import("Sql_lib");
 
 var loadNothing = false;
-var cond = new SqlCondition();
+var cond = newWhere();
 if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
 {
     var rowId = vars.get("$param.RowId_param");
@@ -13,24 +13,26 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
     var rowIdCond = null;
     if (vars.get("$param.ObjectId_param") == "Person")
     {
-        rowIds = db.array(db.COLUMN, SqlCondition.begin()
-                                                 .andPrepare("CONTACT.CONTACTID", rowId)
-                                                 .buildSql("select CONTACT.CONTACTID \n\
-                                                            from CONTACT \n\
-                                                            where CONTACT.PERSON_ID = (select CONTACT.PERSON_ID from CONTACT", null, ")"));
+        var personIdSelect = newWhere("CONTACT.PERSON_ID", newSelect("CONTACT.PERSON_ID")
+                                                            .from("CONTACT")
+                                                            .where("CONTACT.CONTACTID", rowId));                                     
+        rowIds = personIdSelect.array();
     }
-    var activityLinkCond = SqlCondition.begin().andIn("ACTIVITYLINK.OBJECT_ROWID", rowIds)
-                                               .andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
-
-                                                            // TODO: more performant way than IN. Maybe a join??
-    cond.and(SqlUtils.translateStatementWithQuotes(activityLinkCond.buildSql("ACTIVITY.ACTIVITYID in (select ACTIVITYLINK.ACTIVITY_ID from ACTIVITYLINK", "1=2", ")")))
+    
+    var activityLinkSubselect = newSelect("ACTIVITYLINK.ACTIVITY_ID")
+                                        .from("ACTIVITYLINK")
+                                        .where("ACTIVITYLINK.OBJECT_ROWID", rowIds, SqlBuilder.IN())
+                                        .and("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
+        
+                                    // TODO: more performant way than IN. Maybe a join??
+    cond.and("ACTIVITY.ACTIVITYID", activityLinkSubselect, SqlBuilder.IN());
 }
     
 if(vars.getString("$param.OnlyInnate_param") == "true") 
 {
     var ownContactId = EmployeeUtils.getCurrentContactId();
     if (ownContactId)
-        cond.andPrepareIfSet("ACTIVITY.RESPONSIBLE", ownContactId);
+        cond.and("ACTIVITY.RESPONSIBLE", ownContactId);
     else
         loadNothing = true;
 }
@@ -41,7 +43,8 @@ if (loadNothing)
 }
 else
 {
-    //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-    var resCond = cond.translate("1 = 1");
+    //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+    var resCond = cond.toString();
 }
+
 result.string(resCond);
\ No newline at end of file

entity/Activity_entity/recordcontainers/db/onDBDelete.js

@@ -2,7 +2,5 @@ import("system.vars");
 import("system.db");
 import("Sql_lib");
 
-var activityObjectsCondition = SqlCondition.begin()
-                                           .andPrepareVars("ACTIVITYLINK.ACTIVITY_ID", "$field.ACTIVITYID");
-
-db.deleteData("ACTIVITYLINK", activityObjectsCondition.build("1=2"));
\ No newline at end of file
+newWhere("ACTIVITYLINK.ACTIVITY_ID", "$field.ACTIVITYID")
+    .deleteData(true, "ACTIVITYLINK");
\ No newline at end of file

entity/CampaignAnalysis_entity/entityfields/currency/valueProcess.js

@@ -2,6 +2,6 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-result.string(db.cell(SqlCondition.begin()
+result.string(new SqlBuilder().select("CURRENCY ").from("CAMPAIGN")
     .andPrepareVars("CAMPAIGN.CAMPAIGNID", "$param.CampaignId_param")
-    .buildSql("select CURRENCY from CAMPAIGN", "1=2")));
\ No newline at end of file
+    .cell());
\ No newline at end of file

entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js

@@ -8,9 +8,9 @@ import("system.result");
 if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
 {
     // TODO: loadEntity / #Title
-    result.string(translate.text(db.cell(SqlCondition.begin()
+    result.string(translate.text(new SqlBuilder().select("TITLE ").from("CLASSIFICATIONSCORE")
             .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
-            .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
+            .cell()));
 } 
 else
 {

entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js

@@ -6,5 +6,5 @@ import("KeywordRegistry_basic");
 import("Keyword_lib");
 import("Sql_lib");
 
-result.string(translate.text(db.cell(SqlCondition.begin().andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANG")
-                                   .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=2"))));
\ No newline at end of file
+result.string(translate.text(new SqlBuilder().select("NAME_LATIN ").from("AB_LANGUAGE").andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANG")
+                                   .cell()));
\ No newline at end of file