Skip to content
Snippets Groups Projects
Commit 7bcc1781 authored by Timm Fitschen's avatar Timm Fitschen Committed by Florian Spreckelsen
Browse files

fix SELECT name FROM ENTITY

parent 8409cfe0
No related branches found
No related tags found
2 merge requests!21Release v0.4.0,!9fix SELECT name FROM ENTITY
...@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
* #130 - Error during `FIND ENTITY` when
`QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS=False`.
* #125 - `bend_symlinks` script did not allow whitespace in filename. * #125 - `bend_symlinks` script did not allow whitespace in filename.
* #122 - Dead-lock due to error in the DatabaseAccessManager. * #122 - Dead-lock due to error in the DatabaseAccessManager.
* #120 - Editing entities that were created with a no longer existing user * #120 - Editing entities that were created with a no longer existing user
......
...@@ -64,7 +64,7 @@ antlr: ...@@ -64,7 +64,7 @@ antlr:
mvn antlr4:antlr4 mvn antlr4:antlr4
test: print-version easy-units 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 mvn test -X
test_misc: test_misc:
......
...@@ -206,7 +206,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -206,7 +206,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
} }
} }
private static boolean filterEntitiesWithoutRetrievePermisions = private boolean filterEntitiesWithoutRetrievePermisions =
!CaosDBServer.getServerProperty( !CaosDBServer.getServerProperty(
ServerProperties.KEY_QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS) ServerProperties.KEY_QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS)
.equalsIgnoreCase("FALSE"); .equalsIgnoreCase("FALSE");
...@@ -663,13 +663,15 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac ...@@ -663,13 +663,15 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
if (this.container != null && this.type == Type.FIND) { if (this.container != null && this.type == Type.FIND) {
for (final IdVersionPair p : this.resultSet) { 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 query has select-clause:
if (this.selections != null && !this.selections.isEmpty()) { if (this.selections != null && !this.selections.isEmpty()) {
e.addSelections(this.selections); e.addSelections(this.selections);
}
this.container.add(e);
} }
this.container.add(e);
} }
} }
return this; return this;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment