Skip to content
Snippets Groups Projects
Commit 76e8bdd1 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

FIX: workaround for #245

parent 2ac1efde
No related branches found
No related tags found
1 merge request!65F permission checks
Pipeline #26403 passed
...@@ -628,9 +628,10 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -628,9 +628,10 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
*/ */
private String generateSelectStatementForResultSet( private String generateSelectStatementForResultSet(
final String resultSetTableName, final boolean versioned) { 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")) { if (resultSetTableName.equals("entities")) {
final String baseStatement = 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) { if (!versioned) {
return baseStatement + ";"; return baseStatement + ";";
} }
...@@ -643,7 +644,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -643,7 +644,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
return (" SELECT tmp.id, entity_acl.acl FROM " return (" SELECT tmp.id, entity_acl.acl FROM "
+ " (SELECT results.id AS id, entities.acl AS acl_id FROM `" + " (SELECT results.id AS id, entities.acl AS acl_id FROM `"
+ resultSetTableName + 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") + " JOIN entity_acl ON entity_acl.id=tmp.acl_id")
+ ";"; + ";";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment