diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js index 174ad7f6d1a52dda34c6476bf86ec19f02b242a2..5cb1b40d4c12228da15a79c6628d4eb85261b921 100644 --- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js +++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js @@ -3,7 +3,7 @@ import("system.db"); import("system.result"); import("Sql_lib"); -var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param"); +var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param", SqlBuilder.EQUAL); //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026 result.string(cond.toString()); \ No newline at end of file diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js index 16f855efb71eeb30018874ca1755cf21d2f89a79..b998ddb47ff69b040d908fa21fa0c9aa82250aa1 100644 --- a/process/Sql_lib/process.js +++ b/process/Sql_lib/process.js @@ -1445,6 +1445,8 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon { //In a special case, pCondition can be a function. It will be called with the alias as argument and //must return an array of the condition string and (optionally) the required sql field type. + //alternatively the function may return a string only to make the usage more bulletproof and convenient, so both SqlBuilder.EQUAL() + //and SqlBuilder.EQUAL work equally if (pCondition && typeof pCondition === "function") { var resCond = pCondition(this.alias); @@ -1453,6 +1455,10 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon pCondition = resCond[0]; pFieldType = pFieldType || resCond[1]; } + else if(typeof(resCond) == "string") + { + pCondition = resCond; + } } if (pCondition && !SqlUtils.checkConditionFormat(pCondition))