From 86454952f73803468cbd7904605f6b24b13fa060 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 16 Oct 2019 10:43:24 +0200
Subject: [PATCH] Bugfixes SqlBuilder usage
---
.../entityfields/lang/displayValueProcess.js | 11 ++++-------
.../recordcontainers/db/conditionProcess.js | 2 +-
process/Product_lib/process.js | 5 +++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js b/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js
index ff765a8a074..2c0eaf3fa38 100644
--- a/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js
+++ b/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js
@@ -1,11 +1,8 @@
-import("system.db");
import("system.translate");
-import("system.vars");
import("system.result");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
import("Sql_lib");
-result.string(translate.text(new SqlBuilder().select("NAME_LATIN ").from("AB_LANGUAGE")
- .where().andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANG")
- .cell()));
\ No newline at end of file
+result.string(translate.text(newSelect("NAME_LATIN")
+ .from("AB_LANGUAGE")
+ .whereIfSet("AB_LANGUAGE.ISO3", "$field.LANG")
+ .cell(true)));
\ No newline at end of file
diff --git a/entity/Language_entity/recordcontainers/db/conditionProcess.js b/entity/Language_entity/recordcontainers/db/conditionProcess.js
index 44438297863..9e0e3a69ce2 100644
--- a/entity/Language_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Language_entity/recordcontainers/db/conditionProcess.js
@@ -7,7 +7,7 @@ var cond = newWhere()
if (vars.getString("$param.ExcludedIds_param"))
{
- cond.and("AB_LANGUAGE.ISO3", JSON.parse(vars.getString("$param.ExcludedIds_param")), SqlBuilder.NOT_IN())
+ cond.andIfSet("AB_LANGUAGE.ISO3", JSON.parse(vars.getString("$param.ExcludedIds_param")), SqlBuilder.NOT_IN())
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 0504e216b85..1c7f91318e3 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -210,8 +210,9 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
this.join(pJoin[1], pJoin[3], pJoin[2], pJoin[0]);
}, productDataSql)
- var ProductData = productDataSql.orderBy(orderby)
- .and("PRODUCT.PRODUCTID", pid)
+ var ProductData = productDataSql
+ .where("PRODUCT.PRODUCTID", pid)
+ .orderBy(orderby)
.table();
for (var i = 0; i < ProductData.length; i++)
--
GitLab