From 7bcc1781329cc088a896491794f0b87ecbe7d4fc Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 18 May 2021 06:41:09 +0000
Subject: [PATCH] fix SELECT name FROM ENTITY
---
CHANGELOG.md | 2 ++
Makefile | 2 +-
src/main/java/org/caosdb/server/query/Query.java | 14 ++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e560318..d9edd246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
+* #130 - Error during `FIND ENTITY` when
+ `QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS=False`.
* #125 - `bend_symlinks` script did not allow whitespace in filename.
* #122 - Dead-lock due to error in the DatabaseAccessManager.
* #120 - Editing entities that were created with a no longer existing user
diff --git a/Makefile b/Makefile
index d73f140f..21fe03d0 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ antlr:
mvn antlr4:antlr4
test: print-version easy-units
- MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Dcaosdb.debug=true -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:9000"
+ MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Dcaosdb.debug=true -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:$(JPDA_PORT)"
mvn test -X
test_misc:
diff --git a/src/main/java/org/caosdb/server/query/Query.java b/src/main/java/org/caosdb/server/query/Query.java
index cd323bd9..058fc619 100644
--- a/src/main/java/org/caosdb/server/query/Query.java
+++ b/src/main/java/org/caosdb/server/query/Query.java
@@ -206,7 +206,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
}
}
- private static boolean filterEntitiesWithoutRetrievePermisions =
+ private boolean filterEntitiesWithoutRetrievePermisions =
!CaosDBServer.getServerProperty(
ServerProperties.KEY_QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS)
.equalsIgnoreCase("FALSE");
@@ -663,13 +663,15 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
if (this.container != null && this.type == Type.FIND) {
for (final IdVersionPair p : this.resultSet) {
- final Entity e = new RetrieveEntity(p.id, p.version);
+ if (p.id > 99) {
+ final Entity e = new RetrieveEntity(p.id, p.version);
- // if query has select-clause:
- if (this.selections != null && !this.selections.isEmpty()) {
- e.addSelections(this.selections);
+ // if query has select-clause:
+ if (this.selections != null && !this.selections.isEmpty()) {
+ e.addSelections(this.selections);
+ }
+ this.container.add(e);
}
- this.container.add(e);
}
}
return this;
--
GitLab