test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-9769 NPE in Query Parser if returns fetched entities

Browse Source
This commit is contained in:
Andrey Subbotin 2017-10-10 12:07:05 +04:00
parent 3f322b2243
commit f5dbca5e1a
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/test/com/haulmont/cuba/core/global/QueryParserAstBasedTest.java
View File

@ -270,6 +270,12 @@ public class QueryParserAstBasedTest {
assertNull(parser.getEntityNameIfSecondaryReturnedInsteadOfMain());
assertNull(parser.getEntityPathIfSecondaryReturnedInsteadOfMain());
parser = new QueryParserAstBased(model,
"select g from sec$GroupHierarchy h join fetch h.group g"
);
assertNull(parser.getEntityNameIfSecondaryReturnedInsteadOfMain());
assertNull(parser.getEntityPathIfSecondaryReturnedInsteadOfMain());
parser = new QueryParserAstBased(model,
"select h.parent.other from sec$GroupHierarchy h where h.userGroup = :par"
);

48
modules/global/src/com/haulmont/cuba/core/global/QueryParserAstBased.java
View File

@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import static java.lang.String.format;
@ -225,19 +226,20 @@ public class QueryParserAstBased implements QueryParser {
PathNode pathNode = returnedPathNodes.get(0);
if (pathNode.getChildren() == null) {
JpqlEntityModel entity = rootQueryVariableContext.getEntityByVariableName(pathNode.getEntityVariableName());
if (!entity.getName().equals(getEntityName())) {
return new EntityNameAndPath(entity.getName(), pathNode.getEntityVariableName());
}
if (entity != null) {
if (!Objects.equals(entity.getName(), getEntityName())) {
return new EntityNameAndPath(entity.getName(), pathNode.getEntityVariableName());
}
//fix for scary Eclipselink which consider "select p from sec$GroupHierarchy h join h.parent p"
//(even if h.parent is also sec$GroupHierarchy)
//as report query and does not allow to set view
IdentificationVariableNode mainEntityIdentification = getQueryAnalyzer().getMainEntityIdentification();
if (mainEntityIdentification != null
&& !pathNode.getEntityVariableName().equals(mainEntityIdentification.getVariableName())) {
return entity.getName() != null ? new EntityNameAndPath(entity.getName(), pathNode.getEntityVariableName()) : null;
//fix for scary Eclipselink which consider "select p from sec$GroupHierarchy h join h.parent p"
//(even if h.parent is also sec$GroupHierarchy)
//as report query and does not allow to set view
IdentificationVariableNode mainEntityIdentification = getQueryAnalyzer().getMainEntityIdentification();
if (mainEntityIdentification != null
&& !pathNode.getEntityVariableName().equals(mainEntityIdentification.getVariableName())) {
return entity.getName() != null ? new EntityNameAndPath(entity.getName(), pathNode.getEntityVariableName()) : null;
}
}
return null;
}
@ -246,19 +248,23 @@ public class QueryParserAstBased implements QueryParser {
boolean collectionSelect = false;
try {
entity = rootQueryVariableContext.getEntityByVariableName(pathNode.getEntityVariableName());
entityPath = pathNode.asPathString();
if (entity != null) {
entityPath = pathNode.asPathString();
for (int i = 0; i < pathNode.getChildCount(); i++) {
String fieldName = pathNode.getChild(i).toString();
Attribute entityAttribute = entity.getAttributeByName(fieldName);
if (entityAttribute != null && entityAttribute.isEntityReferenceAttribute()) {
entity = model.getEntityByName(entityAttribute.getReferencedEntityName());
if (!collectionSelect) {
collectionSelect = entityAttribute.isCollection();
for (int i = 0; i < pathNode.getChildCount(); i++) {
String fieldName = pathNode.getChild(i).toString();
Attribute entityAttribute = entity.getAttributeByName(fieldName);
if (entityAttribute != null && entityAttribute.isEntityReferenceAttribute()) {
entity = model.getEntityByName(entityAttribute.getReferencedEntityName());
if (!collectionSelect) {
collectionSelect = entityAttribute.isCollection();
}
} else {
return null;
}
} else {
return null;
}
} else {
return null;
}
} catch (UnknownEntityNameException e) {
throw new RuntimeException(format("Unable to find entity by name %s", e.getEntityName()), e);