CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-27 21:01:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #962 from querydsl/i941-2

Browse Source 
Improve in-operation handling
This commit is contained in:
Timo Westkämper 2014-09-25 20:44:10 +03:00
commit dc9d12c40b
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
View File

@ -13,24 +13,12 @@
*/
package com.mysema.query.jpa;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.PersistenceUnitUtil;
import javax.persistence.*;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.SingularAttribute;
import java.util.*;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@ -39,6 +27,7 @@ import com.mysema.query.JoinType;
import com.mysema.query.QueryMetadata;
import com.mysema.query.support.SerializerBase;
import com.mysema.query.types.*;
import com.mysema.query.types.template.NumberTemplate;
import com.mysema.util.MathUtils;
/**
@ -424,29 +413,32 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
}
}
@SuppressWarnings({ "rawtypes", "unchecked" })
private void visitPathInCollection(Class<?> type, Operator<?> operator,
List<? extends Expression<?>> args) {
// NOTE turns entityPath in collection into entityPath.id in (collection of ids)
if (entityManager != null && !templates.isPathInEntitiesSupported() && args.get(0).getType().isAnnotationPresent(Entity.class)) {
Path<?> lhs = (Path<?>) args.get(0);
Constant<?> rhs = (Constant<?>) args.get(1);
Path<?> lhs = (Path<?>) args.get(0);
@SuppressWarnings("unchecked")
Constant<? extends Collection<?>> rhs = (Constant<? extends Collection<?>>) args.get(1);
if (rhs.getConstant().isEmpty()) {
operator = Ops.EQ;
args = ImmutableList.of(NumberTemplate.ONE, NumberTemplate.TWO);
} else if (entityManager != null && !templates.isPathInEntitiesSupported() && args.get(0).getType().isAnnotationPresent(Entity.class)) {
final Metamodel metamodel = entityManager.getMetamodel();
final PersistenceUnitUtil util = entityManager.getEntityManagerFactory().getPersistenceUnitUtil();
final EntityType<?> entityType = metamodel.entity(args.get(0).getType());
if (entityType.hasSingleIdAttribute()) {
SingularAttribute<?,?> id = getIdProperty(entityType);
// turn lhs into id path
lhs = new PathImpl(id.getJavaType(), lhs, id.getName());
lhs = new PathImpl<Object>(id.getJavaType(), lhs, id.getName());
// turn rhs into id collection
Set ids = new HashSet();
for (Object entity : (Collection<?>)rhs.getConstant()) {
Set<Object> ids = new HashSet<Object>();
for (Object entity : rhs.getConstant()) {
ids.add(util.getIdentifier(entity));
}
rhs = ConstantImpl.create(ids);
args = ImmutableList.of(lhs, rhs);
}
}
super.visitOperation(type, operator, args);
}

5
querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
View File

@ -21,6 +21,7 @@ import java.util.Map.Entry;
import antlr.RecognitionException;
import antlr.TokenStreamException;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.mysema.commons.lang.Pair;
import com.mysema.query.group.Group;
@ -709,10 +710,8 @@ public abstract class AbstractJPATest {
}
@Test
@IncludeIn(Target.H2)
@NoBatooJPA
public void In_Empty() {
query().from(cat).where(cat.name.in(Collections.<String>emptyList())).count();
assertEquals(0, query().from(cat).where(cat.name.in(ImmutableList.<String>of())).count());
}
@Test