refactoring of some SQL-library functions

entity/History_entity/conditionProcess.js

@@ -4,27 +4,13 @@ import("system.result");
 import("system.logging");
 import("Sql_lib");
 
-var rowId, conditionStr, preparedValues
-    ,sqlHelper;
-conditionStr = "";
-preparedValues = [];
-sqlHelper = new LegacySqlUtils();
+var rowId, cond, preparedValues, sqlHelper;
+cond = new SqlCondition();
 
-if ((rowId = vars.getString("$param.RowId_param"))){
-    conditionStr += " and HISTORYLINK.ROW_ID = ? ";
-    preparedValues.push([rowId, sqlHelper.getSingleColumnType("HISTORYLINK.ROW_ID")]);
-    
+rowId = vars.getString("$param.RowId_param");
+if (rowId){
+    cond.andPrepare("HISTORYLINK.ROW_ID", "# = ?", rowId);
 }
 
-//TODO; add OBJECT_ID (probably another param)
-//conditionStr += " and HISTORYLINK.OBJECT_ID = ? "
-//preparedValues.push(["1", sqlHelper.getSingleColumnType("HISTORYLINK.OBJECT_ID")]);
-
-if (conditionStr){
-    conditionStr = " 1 = 1 " + conditionStr;
-    result.string(db.translateCondition([conditionStr, preparedValues]));
-}
-else
-    result.string("1 = 1");
-//TODO: use the preparedStatemenet when available:
-//result.object([conditionStr, preparedValues]);
\ No newline at end of file
+//TODO: use a preparedCondition when available
+result.string(db.translateCondition([cond.toString("1 = 1"), cond.preparedValues]));
\ No newline at end of file

entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js

@@ -4,8 +4,8 @@ import("system.db");
 import("Sql_lib");
 
 //TODO: change field to lookup field
-var sqlUtils = new LegacySqlUtils();
-var prodsSql = "select PRODUCTID, " + sqlUtils.concat(["PRODUCTCODE", "'/'", "PRODUCTNAME"]) 
+var sqlUtils = new SqlMaskingUtils();
+var prodsSql = "select PRODUCTID, " + sqlUtils.concat(["PRODUCTCODE", "PRODUCTNAME"], "/") 
                     + " from PRODUCT";
 
 var prods = db.table(prodsSql);

entity/Pers_entity/conditionProcess.js

@@ -3,25 +3,17 @@ import("system.vars");
 import("system.result");
 import("Sql_lib");
 
-var orgId, conditionStr, preparedValues
-    ,sqlHelper;
-conditionStr = "";
-preparedValues = [];
-sqlHelper = new LegacySqlUtils();
+var orgId, cond;
 
-if (vars.exists("$param.OrgId_param") && (orgId = vars.getString("$param.OrgId_param"))){
-    conditionStr += " and RELATION.ORG_ID = ? ";
-    preparedValues.push([orgId, sqlHelper.getSingleColumnType("RELATION.ORG_ID")]);
-    
+cond = new SqlCondition();
+if (vars.exists("$param.OrgId_param")){
+    orgId = vars.getString("$param.OrgId_param");
+    if (orgId != "" && orgId != null){
+        cond.andPrepare("RELATION.ORG_ID", "# = ?", orgId);
+    }
 }
 
 //TODO; add OBJECT_ID (probably another param)
-//conditionStr += " and HISTORYLINK.OBJECT_ID = ? "
-//preparedValues.push(["1", sqlHelper.getSingleColumnType("HISTORYLINK.OBJECT_ID")]);
 
-if (conditionStr){
-    conditionStr = " 1 = 1 " + conditionStr;
-    result.string(db.translateCondition([conditionStr, preparedValues]));
-}
-else
-    result.string("1 = 1");
\ No newline at end of file
+//TODO: use preparedStatements when available
+result.string(db.translateCondition([cond.toString("1 = 1"), cond.preparedValues]));

entity/Pers_entity/entityfields/orgaddress_dfo/children/relid_param/code.js

@@ -3,14 +3,12 @@ import("system.db");
 import("system.vars");
 import("Sql_lib");
 
-var orgId, orgRelId, sqlHelper;
+var orgId, orgRelId, sqlHelper, cond;
  
-sqlHelper = new LegacySqlUtils();
 orgId = vars.get("$field.ORGID");
 if (orgId){
-    orgRelId = db.cell(["select RELATION.RELATIONID from RELATION where RELATION.PERS_ID is null and RELATION.ORG_ID = ?",
-        [
-            [orgId, sqlHelper.getSingleColumnType("RELATION", "ORG_ID")]
-        ]]);
+    cond = new SqlCondition();
+    cond.and("RELATION.PERS_ID is null").andPrepare("RELATION.ORG_ID", "# = ?", orgId)
+    orgRelId = db.cell(["select RELATION.RELATIONID from RELATION" + cond.toWhereString(), cond.preparedValues]);
     result.string(orgRelId);
 }
\ No newline at end of file