diff --git a/src/main/java/org/caosdb/server/query/Query.java b/src/main/java/org/caosdb/server/query/Query.java index a25f40c1628bb028cc9f9e07fffa45c245c2c5e6..eb0679d510386c0be4edb41f3ec1d10487f4ec55 100644 --- a/src/main/java/org/caosdb/server/query/Query.java +++ b/src/main/java/org/caosdb/server/query/Query.java @@ -628,9 +628,10 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac */ private String generateSelectStatementForResultSet( final String resultSetTableName, final boolean versioned) { + // TODO remove the entities.role part when https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/issues/245 is resolved if (resultSetTableName.equals("entities")) { final String baseStatement = - "SELECT entities.id, entity_acl.acl FROM entities INNER JOIN entity_acl ON entity_acl.id=entities.acl"; + "SELECT entities.id, entity_acl.acl FROM entities INNER JOIN entity_acl ON entity_acl.id=entities.acl WHERE entities.role!='DOMAIN'"; if (!versioned) { return baseStatement + ";"; } @@ -643,7 +644,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac return (" SELECT tmp.id, entity_acl.acl FROM " + " (SELECT results.id AS id, entities.acl AS acl_id FROM `" + resultSetTableName - + "` AS results JOIN entities ON results.id=entities.id) AS tmp" + + "` AS results JOIN entities ON results.id=entities.id WHERE entities.role!='DOMAIN') AS tmp" + " JOIN entity_acl ON entity_acl.id=tmp.acl_id") + ";"; }