Merge branch 'f-select-name-from-entity' into 'dev'

fix SELECT name FROM ENTITY

Closes #130

See merge request !9

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

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:

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;