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

Fix SqmMemberOfPredicate negation determination

This commit is contained in:
Andrea Boriero 2022-02-04 13:56:07 +01:00 committed by Andrea Boriero
parent 9a2c87808b
commit f7d5bc857b
2 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1965,7 +1965,7 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
@Override
public SqmPredicate visitMemberOfPredicate(HqlParser.MemberOfPredicateContext ctx) {
final boolean negated = ctx.getChildCount() == 5;
final boolean negated = ctx.NOT() != null;
final SqmPath<?> sqmPluralPath = consumeDomainPath(
(HqlParser.PathContext) ctx.getChild( ctx.getChildCount() - 1 )
);

101
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java
View File

@ -14,6 +14,14 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
@ -30,12 +38,6 @@ import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -107,6 +109,17 @@ public class OneToManyHqlMemberOfQueryTest {
);
}
@AfterEach
public void tearDown(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.createQuery( "delete from Call" ).executeUpdate();
session.createQuery( "delete from Phone" ).executeUpdate();
session.createQuery( "delete from Person" ).executeUpdate();
}
);
}
@Test
public void testMemberOf(SessionFactoryScope scope) {
scope.inTransaction(
@ -114,13 +127,67 @@ public class OneToManyHqlMemberOfQueryTest {
Call call = session.createQuery( "select c from Call c", Call.class ).getResultList().get( 0 );
Phone phone = call.getPhone();
List<Person> persons = session.createQuery(
"select p " +
"from Person p " +
"where :phone member of p.phones", Person.class )
List<Person> people = session.createQuery(
"select p " +
"from Person p " +
"where :phone member of p.phones", Person.class )
.setParameter( "phone", phone )
.getResultList();
assertEquals( 1, persons.size() );
assertEquals( 1, people.size() );
}
);
}
@Test
public void testNegatedMemberOf(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
Call call = session.createQuery( "select c from Call c", Call.class ).getResultList().get( 0 );
Phone phone = call.getPhone();
List<Person> people = session.createQuery(
"select p " +
"from Person p " +
"where :phone not member of p.phones", Person.class )
.setParameter( "phone", phone )
.getResultList();
assertEquals( 2, people.size() );
}
);
}
@Test
public void testMember(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
Call call = session.createQuery( "select c from Call c", Call.class ).getResultList().get( 0 );
Phone phone = call.getPhone();
List<Person> people = session.createQuery(
"select p " +
"from Person p " +
"where :phone member p.phones", Person.class )
.setParameter( "phone", phone )
.getResultList();
assertEquals( 1, people.size() );
}
);
}
@Test
public void testNegatedMember(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
Call call = session.createQuery( "select c from Call c", Call.class ).getResultList().get( 0 );
Phone phone = call.getPhone();
List<Person> people = session.createQuery(
"select p " +
"from Person p " +
"where :phone not member p.phones", Person.class )
.setParameter( "phone", phone )
.getResultList();
assertEquals( 2, people.size() );
}
);
}
@ -131,14 +198,14 @@ public class OneToManyHqlMemberOfQueryTest {
session -> {
Call call = session.createQuery( "select c from Call c", Call.class ).getResultList().get( 0 );
List<Person> persons = session.createQuery(
"select p " +
"from Person p " +
"join p.phones phone " +
"where :call member of phone.calls", Person.class )
List<Person> people = session.createQuery(
"select p " +
"from Person p " +
"join p.phones phone " +
"where :call member of phone.calls", Person.class )
.setParameter( "call", call )
.getResultList();
assertEquals( 1, persons.size() );
assertEquals( 1, people.size() );
}
);
}