From 0cb917fa665767b475b5aab1e39c10de75c7808f Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 18 Jul 2019 16:23:28 +0200
Subject: [PATCH] sql fixes
---
.../entityfields/attribute_type/stateProcess.js | 4 ++--
process/Attribute_lib/process.js | 4 ++--
process/Bulkmail_lib/process.js | 8 ++++----
process/Contact_lib/process.js | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
index 96d928dedfd..94b08b434bc 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -21,9 +21,9 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.r
var hasSubordinate = db.cell(SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", "$field.UID")
.buildSql(
- "select count(*) = 0 from AB_ATTRIBUTE", "1=2"
+ "select count(*) from AB_ATTRIBUTE", "1=2" //TODO: is there a way exists could be used?
)
- ) != "true";
+ ) != "0";
if (hasSubordinate)
state = neon.COMPONENTSTATE_READONLY;
}
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 8e7ff145543..4ccea897948 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -185,9 +185,9 @@ AttributeUtil.hasRelations = function (pAttributeId)
return db.cell(SqlCondition.begin()
.andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttributeId)
.buildSql(
- "select count(*) = 0 from AB_ATTRIBUTERELATION", "1=2"
+ "select count(*) from AB_ATTRIBUTERELATION", "1=2" //TODO: is there a way exists could be used?
)
- ) != "true";
+ ) != "0";
}
/**
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 9f49e54e7b7..3ec4471587e 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -189,8 +189,8 @@ BulkMailUtils.isRecipient = function (pBulkMailId, pContactId)
return db.cell(SqlCondition.begin()
.andPrepare("BULKMAILRECIPIENT.CONTACT_ID", pContactId)
.andPrepare("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
- .buildSql("select count(*) = 0 from BULKMAILRECIPIENT")
- ) != "true";
+ .buildSql("select count(*) from BULKMAILRECIPIENT") //TODO: is there a way exists could be used?
+ ) != "0";
}
function SerialLetterUtils () {}
@@ -245,6 +245,6 @@ SerialLetterUtils.isRecipient = function (pSerialLetterId, pContactId)
return db.cell(SqlCondition.begin()
.andPrepare("LETTERRECIPIENT.CONTACT_ID", pContactId)
.andPrepare("LETTERRECIPIENT.SERIALLETTER_ID", pSerialLetterId)
- .buildSql("select count(*) = 0 from LETTERRECIPIENT")
- ) != "true";
+ .buildSql("select count(*) from LETTERRECIPIENT") //TODO: is there a way exists could be used?
+ ) != "0";
}
\ No newline at end of file
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 63a47219b9f..88f2a5b4878 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -456,9 +456,9 @@ ContactUtils.hasCommRestriction = function (pContactId, pMedium, pStartDate)
var query = SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", pContactId)
.andSqlCondition(ContactUtils.getCommRestrictionCondition(pMedium, false, pStartDate))
- .buildSql("select count(*) = 0 from CONTACT", "1=2");
+ .buildSql("select count(*) from CONTACT", "1=2"); //TODO: is there a way exists could be used?
- return db.cell(query) != "true";
+ return db.cell(query) != "0";
}
/**
--
GitLab