merged sqlLibRefactor into master

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/360Degree_entity/recordcontainers/jdito/contentProcess.js

@@ -89,9 +89,9 @@ function _get360Data(pSelectMap, pBaseContextId, pContactId, pContextList, pActi
         
         for (subContextId in subContexts)
         {
-            var subContextSql = subContexts[subContextId][0];
+            var subContextSelect = subContexts[subContextId][0];
             // select Ids from subcontexts
-            var subContextContactIds = db.array(db.COLUMN, subContextSql);
+            var subContextContactIds = subContextSelect.arrayColumn();
 
             subContextContactIds.forEach(function(pId) {
                                                                                                                                         // V-- do not add subcontexts deeper than one layer

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 = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param");
 
-//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-result.string(cond.translate("1 = 0"));
+//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,29 @@ 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 = newSelect("CONTACT.CONTACTID")
+                                    .from("CONTACT")
+                                    .where("CONTACT.CONTACTID", rowId)
+                                    .and("CONTACT.PERSON_ID", newSelect("CONTACT.PERSON_ID")
+                                                                .from("CONTACT")
+                                                                .where("CONTACT.CONTACTID", rowId));                                     
+        rowIds = personIdSelect.array(db.COLUMN);
     }
-    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 +46,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");
-
+newWhere("ACTIVITYLINK.ACTIVITY_ID", "$field.ACTIVITYID")
+    .deleteData(true, "ACTIVITYLINK");
\ No newline at end of file
-db.deleteData("ACTIVITYLINK", activityObjectsCondition.build("1=2"));
\ No newline at end of file

entity/AddressType_entity/recordcontainers/db/conditionProcess.js

@@ -5,21 +5,20 @@ import("KeywordRegistry_basic");
 import("Sql_lib");
 import("Keyword_lib");
 
-var cond = SqlCondition.begin()
-                       .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.addressType());
+var cond = newWhere("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.addressType());
 
 
 var usageFilter = vars.get("$param.UsageFilter_param");
 if (usageFilter)
 {
     var keywordAttribute = new KeywordAttribute($KeywordRegistry.addressType(), usageFilter);
-    cond.andAttachPrepared(SqlCondition.begin()
-                                       .andPrepare("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", keywordAttribute.id)
-                                       .andPrepare("AB_KEYWORD_ATTRIBUTERELATION." + keywordAttribute.dbField, "1")
-                                       .buildSql("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID in (\n\
-                                                    select AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID \n\
-                                                    from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
+    
+    cond.and("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", 
+                newSelect("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID")
+                    .from("AB_KEYWORD_ATTRIBUTERELATION")
+                    .where(["AB_KEYWORD_ATTRIBUTERELATION", keywordAttribute.dbField], "1"),
+            SqlBuilder.IN())
 }
 
-cond = cond.translate("1 = 2");
-result.string(cond);
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file

entity/Address_entity/conditionProcess.js

@@ -2,5 +2,5 @@ import("Sql_lib");
 import("system.db");
 import("system.result");
 
-//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"));  
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(newWhereIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param").toString());

entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js

@@ -12,9 +12,10 @@ import("system.vars");
 var contactId = vars.get("$param.ContactId_param");
 if (contactId)
 {
-    var sql = SqlCondition.begin()
-    .andPrepare("CONTACT.CONTACTID", contactId)
-    .buildSql("select CONTACT.ADDRESS_ID from CONTACT");
-    var organisationId = db.cell(sql);
+    var organisationId = newSelect("CONTACT.ADDRESS_ID")
+                            .from("CONTACT")
+                            .where("CONTACT.CONTACTID", contactId)
+                            .cell();
+
     result.string(organisationId);
 }
\ No newline at end of file

entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js

@@ -12,9 +12,9 @@ import("system.vars");
 var contactId = vars.get("$param.ContactId_param");
 if (contactId)
 {
-    var sql = SqlCondition.begin()
-                          .andPrepare("CONTACT.CONTACTID", contactId)
-                          .buildSql("select CONTACT.ORGANISATION_ID from CONTACT");
-    var organisationId = db.cell(sql);
+    var organisationId = newSelect("CONTACT.ORGANISATION_ID")
+                            .from("CONTACT")
+                            .where("CONTACT.CONTACTID", contactId)
+                            .cell();
     result.string(organisationId);
 }
\ No newline at end of file

entity/Address_entity/recordcontainers/childgroup/query.js

@@ -8,13 +8,15 @@ if (vars.exists("$local.idvalue")) {
     affectedIds = vars.get("$local.idvalue");
 }
 
-result.string(SqlUtils.translateStatementWithQuotes(SqlCondition.begin()
-            .andIn("ADDRESS.ADDRESSID", affectedIds)
-            .buildSql("select \n\
-                        ADDRESS.ADDRESSID as \"_uid_\", \n\
-                        ADDRESS.ADDRESSID, \n\
-                        ADDRESS.ZIP as ZIP, \n\
-                        ADDRESS.CITY as CITY, \n\
-                        ADDRESS.COUNTRY, \n\
-                        ADDRESS.ADDRESS, \n\
-                        ADDRESS.BUILDINGNO from ADDRESS", "", "order by ADDRESS.ADDRESSID")));
+var addressSelect = newSelect("ADDRESS.ADDRESSID as \"_uid_\", \n\
+                               ADDRESS.ADDRESSID, \n\
+                               ADDRESS.ZIP as ZIP, \n\
+                               ADDRESS.CITY as CITY, \n\
+                               ADDRESS.COUNTRY, \n\
+                               ADDRESS.ADDRESS, \n\
+                               ADDRESS.BUILDINGNO")
+                            .from("ADDRESS")
+                            .where("ADDRESS.ADDRESSID", affectedIds, SqlBuilder.IN())
+                            .orderBy("ADDRESS.ADDRESSID")
\ No newline at end of file
+
+result.string(addressSelect.toString());
\ No newline at end of file

entity/Address_entity/recordcontainers/db/conditionProcess.js

@@ -3,19 +3,18 @@ import("system.vars");
 import("system.db");
 import("Sql_lib");
 
-var cond = SqlCondition.begin()
-                       .andPrepareVars("ADDRESS.CONTACT_ID", "$param.ContactId_param");
-                       
+var cond = newWhereIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param");
+
 var organisationId = vars.get("$param.OrganisationId_param");
 if (organisationId)
 {
-    var organisationContactSql = SqlCondition.begin()
-                                             .andPrepare("CONTACT.ORGANISATION_ID", organisationId)
-                                             .and("CONTACT.PERSON_ID is null")
-                                             .buildSql("select CONTACT.CONTACTID from CONTACT");
-    var organisationContactId = db.cell(organisationContactSql);
-    cond.orPrepare("ADDRESS.CONTACT_ID", organisationContactId);
+    var organisationContactId = newSelect("CONTACT.CONTACTID")
+                                    .from("CONTACT")
+                                    .where("CONTACT.ORGANISATION_ID", organisationId)
+                                    .and("CONTACT.PERSON_ID is null")
+                                    .cell();
+    cond.orIfSet("ADDRESS.CONTACT_ID", organisationContactId);
 }
 
-//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-result.string(cond.translate("1 = 2"));
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file

entity/Analyses_entity/entityfields/myturnover/valueProcess.js

@@ -6,8 +6,9 @@ import("Date_lib");
 import("Sql_lib");
 import("system.SQLTYPES")
 
-var turnover = db.cell(SqlCondition.begin()
-                                   .andPrepare("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
-                                   .buildSql("select sum(NET + VAT) from SALESORDER", "1=2"));
+var turnover = newSelect("sum(NET + VAT)")
+                    .from("SALESORDER")
+                    .where("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+                    .cell();
                                   
 result.string(turnover);
\ No newline at end of file

entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js

+import("system.neon");
+import("system.db");
+import("ActivityTask_lib");
 import("Employee_lib");
 import("system.vars");
-import("system.datetime");
-import("system.db");
-import("system.neon");
-import("Date_lib");
 import("Sql_lib");
 
-var overduetask = db.table(SqlCondition.begin()
-                    .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
-                    .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
-                    .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
-                    .buildSql("select TASKID from TASK", "1=2"));
+var overdueTask = newSelect("TASKID")
+                    .from("TASK")
+                    .where("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+                    .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
+                    .array(db.COLUMN)
 
-neon.openContext("Task", "TaskFilter_view", overduetask, neon.OPERATINGSTATE_SEARCH, null);
+neon.openContext("Task", "TaskFilter_view", overdueTask, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file

entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js

-import("Employee_lib");
-import("system.db");
-import("system.datetime");
-import("system.result");
 import("system.vars");
-import("Date_lib");
+import("Employee_lib");
 import("Sql_lib");
+import("ActivityTask_lib");
+import("system.result");
+
+var overdueTaskCount = newSelect("count(TASKID)")
+                    .from("TASK")
+                    .where("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+                    .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
+                    .cell()
 
-var overduetask = db.cell(SqlCondition.begin()
-                                   .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+result.string(overdueTaskCount);
\ No newline at end of file
-                                   .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
-                                   .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
-                                   .buildSql("select count(TASKID) from TASK", "1=2"));
-                                                                  
-result.string(overduetask);

entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js

@@ -6,8 +6,9 @@ import("Date_lib");
 import("Sql_lib");
 import("system.SQLTYPES")
 
-var forecast = db.cell(SqlCondition.begin()
-                                    .andPrepare("FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
-                                    .buildSql("select sum(VOLUME) from FORECAST", "1=2"));
+var forecast = newSelect("sum(VOLUME)")
+                .from("FORECAST")
+                .where("FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+                .cell();
                                   
 result.string(forecast);
\ No newline at end of file

entity/AnyContact_entity/recordcontainers/db/conditionProcess.js

@@ -4,7 +4,7 @@ import("system.result");
 import("Sql_lib");
 import("Contact_lib");
 
-var orgContactId;
+var orgContactId = null;
 if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
 {
     var contactId = vars.get("$param.ContactId_param");
@@ -16,19 +16,18 @@ if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
     }
 }
 
-var conditionPrivateOrganisation = SqlCondition.begin()
-                                               .andPrepare("CONTACT.ORGANISATION_ID", "0", "# != ?");
+var conditionPrivateOrganisation = newWhere("CONTACT.ORGANISATION_ID", "0", "# <> ?")
 
 if (vars.getString("$param.WithPrivatePersons_param") == "true")
-    conditionPrivateOrganisation.orSqlCondition(SqlCondition.begin()
-                                                            .andPrepare("CONTACT.ORGANISATION_ID", "0")
-                                                            .and("CONTACT.PERSON_ID is not null")
-                                                );
+{
+    conditionPrivateOrganisation.or(newWhere("CONTACT.ORGANISATION_ID", "0")
+                                        .and("CONTACT.PERSON_ID is not null"));
+}
+    
 
 //exclude private organisation
-var cond = SqlCondition.begin()
-                       .andSqlCondition(conditionPrivateOrganisation)
-                       .andPrepareIfSet("CONTACT.ORGANISATION_ID", orgContactId);
+var cond = newWhereIfSet(conditionPrivateOrganisation)
+               .andIfSet("CONTACT.ORGANISATION_ID", orgContactId);
 
-//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-result.string(cond.translate());
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file

entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js

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

entity/Appointment_entity/recordcontainers/jdito/contentProcess.js

@@ -10,7 +10,7 @@ import("system.eMath");
 import("system.util");
 import("system.neon");
 
-var cond = SqlCondition.begin();
+var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
 var appointmentUids;
 
 if(vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
@@ -23,10 +23,8 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
 {
     var contactid = EmployeeUtils.getCurrentContactId();
     
-    cond.andPrepareIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
-
-    appointmentUids = db.table(cond.buildSql("select APPOINTMENT_ID from AB_APPOINTMENTLINK"));
-    result.object(buildEntriesFromUids(appointmentUids));
+    appointmentSelect.whereIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
+    result.object(buildEntriesFromUids(appointmentSelect.table()));
 }
 
 /**
@@ -34,10 +32,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")
-   
-    appointmentUids = db.table(cond.buildSql("select APPOINTMENT_ID from AB_APPOINTMENTLINK"));
-    result.object(buildEntriesFromUids(appointmentUids));
+    appointmentSelect.whereIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
+    result.object(buildEntriesFromUids(appointmentSelect.table()));
 }
 /**
  * Will be used, if the user is operating the calendar.