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

Merge pull request #888 from querydsl/i880

Browse Source 
Fix any path handling
This commit is contained in:
Timo Westkämper 2014-08-09 11:22:18 +03:00
commit 4489bf64c0
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
View File

@ -13,6 +13,8 @@
*/
package com.mysema.query.support;
import javax.annotation.Nullable;
import com.mysema.query.DefaultQueryMetadata;
import com.mysema.query.JoinFlag;
import com.mysema.query.JoinType;
@ -48,6 +50,8 @@ public class QueryMixin<T> {
private final boolean expandAnyPaths;
private ReplaceVisitor replaceVisitor;
private T self;
public QueryMixin() {
@ -121,18 +125,35 @@ public class QueryMixin<T> {
return p;
}
private Path<?> normalizePath(Path<?> expr) {
Context context = new Context();
Path<?> replaced = (Path<?>)expr.accept(CollectionAnyVisitor.DEFAULT, context);
if (!replaced.equals(expr)) {
for (int i = 0; i < context.paths.size(); i++) {
Path path = context.paths.get(i).getMetadata().getParent();
Path replacement = context.replacements.get(i);
this.innerJoin(path, replacement);
}
return replaced;
} else {
return expr;
}
}
@SuppressWarnings("rawtypes")
public <RT> Expression<RT> convert(Expression<RT> expr, boolean forOrder) {
if (expandAnyPaths && expr instanceof Path) {
Context context = new Context();
Expression replaced = expr.accept(CollectionAnyVisitor.DEFAULT, context);
if (!replaced.equals(expr)) {
for (int i = 0; i < context.paths.size(); i++) {
Path path = context.paths.get(i).getMetadata().getParent();
Path replacement = context.replacements.get(i);
this.innerJoin(path, replacement);
if (expandAnyPaths) {
if (expr instanceof Path) {
expr = (Expression)normalizePath((Path)expr);
} else if (expr != null) {
if (replaceVisitor == null) {
replaceVisitor = new ReplaceVisitor() {
public Expression<?> visit(Path<?> expr, @Nullable Void context) {
return normalizePath(expr);
}
};
}
return replaced;
expr = (Expression)expr.accept(replaceVisitor, null);
}
}
if (expr instanceof ProjectionRole<?>) {

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

@ -240,6 +240,11 @@ public abstract class AbstractJPATest {
assertFalse(query().from(cat).list(cat.kittens.any().name).isEmpty());
}
@Test
public void Any_In_Projection3() {
assertFalse(query().from(cat).list(cat.kittens.any().name, cat.kittens.any().bodyWeight).isEmpty());
}
@Test
public void Any_In1() {
//select cat from Cat cat where exists (