From ab88d92ed66c5b733e3c176094aca9f70ba5b1e4 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 11 Nov 2020 13:28:19 +0100
Subject: [PATCH] FIX: find any version of entity ...
---
src/main/java/org/caosdb/server/query/Query.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/caosdb/server/query/Query.java b/src/main/java/org/caosdb/server/query/Query.java
index e7bed06e..695a295d 100644
--- a/src/main/java/org/caosdb/server/query/Query.java
+++ b/src/main/java/org/caosdb/server/query/Query.java
@@ -272,7 +272,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
applyQueryTemplates(this, getSourceSet());
}
- if (this.role != null) {
+ if (this.role != null && this.role != Role.ENTITY) {
final RoleFilter roleFilter = new RoleFilter(this.role, "=", this.versioned);
roleFilter.apply(this);
}
@@ -324,7 +324,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
final Query subQuery = new Query(q.getValue(), query.getUser());
subQuery.setAccess(query.getAccess());
subQuery.parse();
- // TODO versioning is set to false here (hard) it this the best way to do it?
+
+ // versioning for QueryTemplates is not supported and probably never will.
final String subResultSet = subQuery.executeStrategy(false);
// ... and merge the resultSets.
--
GitLab