Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix queries like 'select ... where ...' with no 'from' clause 

this was another bug that resulted from the unnecessary use of
the untypesafe getChild() method in SemanticQueryBuilder. It's
really important that we migrate away from that, who knows how
many other bugs are lurking?
This commit is contained in:
Gavin 2023-01-11 10:36:04 +01:00 committed by Gavin King
parent c402431b9f
commit 296cbb88bd
2 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
View File

@ -291,7 +291,7 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
Class<R> expectedResultType,
SqmCreationOptions creationOptions,
SqmCreationContext creationContext) {
return new SemanticQueryBuilder<R>( expectedResultType, creationOptions, creationContext ).visitStatement( hqlParseTree );
return new SemanticQueryBuilder<>( expectedResultType, creationOptions, creationContext ).visitStatement( hqlParseTree );
}
private final Class<R> expectedResultType;
@ -843,7 +843,7 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
}
final String searchAttributeName = visitIdentifier( (HqlParser.IdentifierContext) ctx.getChild( ctx.getChildCount() - 1 ) );
final HqlParser.SearchSpecificationsContext searchCtx = (HqlParser.SearchSpecificationsContext) ctx.getChild( 4 );
final List<JpaSearchOrder> searchOrders = new ArrayList<>( ( searchCtx.getChildCount() + 1 ) >> 1 );;
final List<JpaSearchOrder> searchOrders = new ArrayList<>( ( searchCtx.getChildCount() + 1 ) >> 1 );
final List<ParseTree> children = searchCtx.children;
final JpaCteCriteriaType<?> type = cteDefinition.getType();
for ( int i = 0; i < children.size(); i += 2 ) {
@ -913,9 +913,9 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
}
@Override
public SqmQueryPart<Object> visitQuerySpecExpression(HqlParser.QuerySpecExpressionContext ctx) {
public SqmQueryPart<?> visitQuerySpecExpression(HqlParser.QuerySpecExpressionContext ctx) {
final List<ParseTree> children = ctx.children;
final SqmQueryPart<Object> queryPart = visitQuery( (HqlParser.QueryContext) children.get( 0 ) );
final SqmQueryPart<?> queryPart = visitQuery( (HqlParser.QueryContext) children.get( 0 ) );
if ( children.size() > 1 ) {
visitQueryOrder( queryPart, (HqlParser.QueryOrderContext) children.get( 1 ) );
}
@ -1115,28 +1115,14 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
}
@Override
public SqmQuerySpec<Object> visitQuery(HqlParser.QueryContext ctx) {
//noinspection unchecked
final SqmQuerySpec<Object> sqmQuerySpec = (SqmQuerySpec<Object>) currentQuerySpec();
final int fromIndex;
if ( ctx.getChild( 0 ) instanceof HqlParser.FromClauseContext ) {
fromIndex = 0;
}
else {
fromIndex = 1;
}
public SqmQuerySpec<?> visitQuery(HqlParser.QueryContext ctx) {
final SqmQuerySpec<?> sqmQuerySpec = currentQuerySpec();
// visit from-clause first!!!
visitFromClause( (HqlParser.FromClauseContext) ctx.getChild( fromIndex ) );
visitFromClause( ctx.fromClause() );
final SqmSelectClause selectClause;
if ( fromIndex == 1 ) {
selectClause = visitSelectClause( (HqlParser.SelectClauseContext) ctx.getChild( 0 ) );
}
else if ( ctx.getChild( ctx.getChildCount() - 1 ) instanceof HqlParser.SelectClauseContext ) {
selectClause = visitSelectClause( (HqlParser.SelectClauseContext) ctx.getChild( ctx.getChildCount() - 1 ) );
}
else {
if ( ctx.selectClause() == null ) {
if ( creationOptions.useStrictJpaCompliance() ) {
throw new StrictJpaComplianceViolation(
"Encountered implicit select-clause, but strict JPQL compliance was requested",
@ -1146,24 +1132,22 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
log.debugf( "Encountered implicit select clause : %s", ctx.getText() );
selectClause = buildInferredSelectClause( sqmQuerySpec.getFromClause() );
}
else {
selectClause = visitSelectClause( ctx.selectClause() );
}
sqmQuerySpec.setSelectClause( selectClause );
int currentIndex = fromIndex + 1;
final SqmWhereClause whereClause = new SqmWhereClause( creationContext.getNodeBuilder() );
if ( currentIndex < ctx.getChildCount() && ctx.getChild( currentIndex ) instanceof HqlParser.WhereClauseContext ) {
whereClause.setPredicate( (SqmPredicate) ctx.getChild( currentIndex++ ).accept( this ) );
if ( ctx.whereClause() != null ) {
whereClause.setPredicate( (SqmPredicate) ctx.whereClause().accept( this ) );
}
sqmQuerySpec.setWhereClause( whereClause );
if ( currentIndex < ctx.getChildCount() && ctx.getChild( currentIndex ) instanceof HqlParser.GroupByClauseContext ) {
sqmQuerySpec.setGroupByClauseExpressions(
visitGroupByClause( (HqlParser.GroupByClauseContext) ctx.getChild( currentIndex++ ) )
);
if ( ctx.groupByClause() != null ) {
sqmQuerySpec.setGroupByClauseExpressions( visitGroupByClause( ctx.groupByClause() ) );
}
if ( currentIndex < ctx.getChildCount() && ctx.getChild( currentIndex ) instanceof HqlParser.HavingClauseContext ) {
sqmQuerySpec.setHavingClausePredicate(
visitHavingClause( (HqlParser.HavingClauseContext) ctx.getChild( currentIndex ) )
);
if ( ctx.havingClause() != null ) {
sqmQuerySpec.setHavingClausePredicate( visitHavingClause( ctx.havingClause() ) );
}
return sqmQuerySpec;

32
hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
View File

@ -1604,4 +1604,36 @@ public class FunctionTests {
);
}
@Test
public void testIn(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
assertEquals( 1,
session.createQuery("select 1 where 1 in (:list)")
.setParameterList("list",List.of(1,2))
.list().size() );
assertEquals( 0,
session.createQuery("select 1 where 1 in (:list)")
.setParameterList("list",List.of(0,3,2))
.list().size() );
assertEquals( 0,
session.createQuery("select 1 where 1 in (:list)")
.setParameterList("list",List.of())
.list().size() );
assertEquals( 1,
session.createQuery("select 1 where 1 in :list")
.setParameterList("list",List.of(1,2))
.list().size() );
assertEquals( 0,
session.createQuery("select 1 where 1 in :list")
.setParameterList("list",List.of(0,3,2))
.list().size() );
assertEquals( 0,
session.createQuery("select 1 where 1 in :list")
.setParameterList("list",List.of())
.list().size() );
}
);
}
}