From 7323d9265179f29c6cb53005b262dcee9e074983 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 6 Dec 2021 17:10:53 +0100
Subject: [PATCH] SqlMaskingUtils usage refactoring
---
.../BulkMail_entity/recordcontainers/db/orderClauseProcess.js | 2 +-
.../db/recordfieldmappings/datelastedit.value/expression.js | 2 +-
.../db/recordfieldmappings/userlastedit.value/expression.js | 2 +-
.../Weblink_entity/recordcontainers/db/orderClauseProcess.js | 2 +-
.../db/recordfieldmappings/datelastchange.value/expression.js | 2 +-
process/Sql_lib/process.js | 3 ++-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js b/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
index 3c74afcc36f..837c0929f90 100644
--- a/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
@@ -3,6 +3,6 @@ import("system.db");
import("Sql_lib");
ref = {};
-ref[SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING;
+ref[new SqlMaskingUtils().isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING;
result.object(ref);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js
index e8375af8673..5ea86d6ad7c 100644
--- a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js
@@ -1,6 +1,6 @@
import("system.result");
import("Sql_lib");
-var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW");
+var cond = new SqlMaskingUtils().isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW");
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js
index 2df0709d0bf..d9c759971c5 100644
--- a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js
@@ -1,6 +1,6 @@
import("system.result");
import("Sql_lib");
-var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW");
+var cond = new SqlMaskingUtils().isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW");
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js b/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js
index f3aa364a806..2e069f777aa 100644
--- a/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js
@@ -3,6 +3,6 @@ import("system.result");
import("Sql_lib");
var ret = {};
-ret[SqlMaskingUtils.prototype.isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW")] = db.DESCENDING;
+ret[new SqlMaskingUtils().isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW")] = db.DESCENDING;
result.object(ret);
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js
index 02a47dbbaf0..ac99863a915 100644
--- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js
@@ -1,6 +1,6 @@
import("system.result");
import("Sql_lib");
-var cond = SqlMaskingUtils.prototype.isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW");
+var cond = new SqlMaskingUtils().isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW");
result.string(cond);
\ No newline at end of file
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index ecc8f1ed818..c77721eaeca 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -3404,8 +3404,9 @@ SqlMaskingUtils.prototype.isNull = function (pField, pReplacement)
case db.DBTYPE_DERBY10:
case db.DBTYPE_MYSQL4:
case db.DBTYPE_MARIADB10:
- default:
return "coalesce(" + pField + ", " + pReplacement + ")";
+ default:
+ throw new Error(translate.withArguments("${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0", ["SqlMaskingUtils.prototype.isNull"]));
}
}
--
GitLab