From 4150d7de75a8360dfd4e389307178809897c4293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 21 Nov 2008 09:28:04 +0000 Subject: [PATCH] fixed handling of Locale typed properties --- .../src/main/java/com/mysema/query/grammar/types/Expr.java | 2 ++ .../java/com/mysema/query/grammar/types/IntGrammar.java | 6 ++---- .../src/main/java/com/mysema/query/grammar/types/Path.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java index 0c65a02aa..22cbcf638 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Expr.java @@ -96,6 +96,8 @@ public abstract class Expr { public static abstract class Simple extends Expr{ public Simple(Class type) {super(type);} public Expr as(java.lang.String to){return IntGrammar.as(this, to);} + public Boolean in(D... args) {return IntGrammar.in(this,args);} + public Boolean in(CollectionType arg) {return IntGrammar.in(this, arg);} } /** diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/IntGrammar.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/IntGrammar.java index 4a2f3583f..33a87c871 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/IntGrammar.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/IntGrammar.java @@ -132,13 +132,11 @@ class IntGrammar{ return createBoolean(Ops.GT, left, right); } - static > Expr.Boolean in(Expr left, + static Expr.Boolean in(Expr left, A... rest) { return createBoolean(Ops.IN, left, createConstant(rest)); } - - - + static Expr.Boolean in(Expr left, CollectionType right){ return createBoolean(Ops.IN, left, (Expr)right); } diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java index e360b7fff..9a0a9def9 100644 --- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java +++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Path.java @@ -148,7 +148,7 @@ public interface Path { protected EntityList _entitylist(java.lang.String path,Class type) { return new EntityList(type, forProperty(this, path)); } - protected Expr.Simple _simple(java.lang.String path, Class type){ + protected Path.Simple _simple(java.lang.String path, Class type){ return new Path.Simple(type, forProperty(this, path)); } protected ComponentCollection _simplecol(java.lang.String path,Class type) {