Skip to content
Snippets Groups Projects
Commit f9126300 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

correct alias & use sqlBuilder

parent b579222d
No related branches found
No related tags found
No related merge requests found
......@@ -201,7 +201,7 @@
<recordContainers>
<jDitoRecordContainer>
<name>jDito</name>
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
......
......@@ -1337,17 +1337,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>FIRSTNAME.value</name>
<indexFieldType>TEXT_NO_STOPWORDS</indexFieldType>
<isBoosted v="true" />
<name>FIRSTNAME.value</name>
<indexFieldType>PHONETIC_NAME</indexFieldType>
<isBoosted v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>LASTNAME.value</name>
<indexFieldType>TEXT_NO_STOPWORDS</indexFieldType>
<isBoosted v="true" />
<name>LASTNAME.value</name>
<indexFieldType>PHONETIC_NAME</indexFieldType>
<isBoosted v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>SALUTATION.value</name>
......
......@@ -19,23 +19,32 @@ switch (tableName)
res = [idValue];
break;
case "PERSON":
res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID = '" + idValue + "'");
res = newSelect("CONTACT.CONTACTID")
.from("CONTACT")
.where("CONTACT.PERSON_ID", idValue)
.arrayColumn();
break;
case "ORGANISATION":
res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is not null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
res = newSelect("CONTACT.CONTACTID")
.from("CONTACT")
.where("CONTACT.ORGANISATION_ID", idValue)
.and("CONTACT.PERSON_ID is not null")
.arrayColumn();
break;
case "ADDRESS":
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
[id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
]]);
return newSelect("ADDRESS.CONTACT_ID")
.from("ADDRESS")
.where("ADDRESS.ADDRESSID", id)
.arrayColumn();
});
break;
case "COMMUNICATION":
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select COMMUNICATION.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
return newSelect("COMMUNICATION.CONTACT_ID")
.from("COMMUNICATION")
.where("COMMUNICATION.COMMUNICATIONID", id)
.arrayColumn();
});
break;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment