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

made Query transformation more generic

Browse Source
This commit is contained in:
Timo Westkämper 2012-03-10 00:08:26 +02:00
parent 889ca6c4ac
commit 965db09bda
3 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
querydsl-jpa/pom.xml
View File

@ -54,7 +54,14 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>2.3.0-M6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
@ -93,12 +100,6 @@
</dependency>
<!-- test -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>2.3.0-M6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>postgresql</groupId>

37
querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java
View File

@ -13,6 +13,7 @@
*/
package com.mysema.query.jpa.impl;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
@ -72,8 +73,6 @@ public abstract class AbstractJPAQuery<Q extends AbstractJPAQuery<Q>> extends JP
@Nullable
protected FlushModeType flushMode;
protected boolean factoryExpressionUsed = false;
@ -159,25 +158,31 @@ public abstract class AbstractJPAQuery<Q extends AbstractJPAQuery<Q>> extends JP
// set transformer, if necessary and possible
List<? extends Expression<?>> projection = getMetadata().getProjection();
if (projection.size() == 1 && !forCount) {
Expression<?> expr = projection.get(0);
Expression<?> expr = projection.get(0);
if (expr instanceof FactoryExpression<?>) {
String transformation = null;
if (hibernateQueryClass != null && hibernateQueryClass.isInstance(query)) {
transformation = "com.mysema.query.jpa.impl.HibernateQueryTransformation";
}
// else if (query.getClass().getName().startsWith("org.eclipse.persistence")) {
// transformation = "com.mysema.query.jpa.impl.EclipseLinkQueryTransformation";
// }
if (transformation != null) {
try {
Class<?> cl = Class.forName("com.mysema.query.jpa.impl.HibernateQueryTransformation");
cl.getConstructor(Query.class, FactoryExpression.class).newInstance(query, expr);
} catch (ClassNotFoundException e) {
throw new QueryException(e.getMessage(), e);
} catch (SecurityException e) {
throw new QueryException(e.getMessage(), e);
} catch (InstantiationException e) {
throw new QueryException(e.getMessage(), e);
} catch (IllegalAccessException e) {
throw new QueryException(e.getMessage(), e);
} catch (InvocationTargetException e) {
throw new QueryException(e.getMessage(), e);
Constructor<?> c = Class.forName(transformation).getConstructor(Query.class, FactoryExpression.class);
c.newInstance(query, expr);
} catch (NoSuchMethodException e) {
throw new QueryException(e.getMessage(), e);
throw new QueryException(e);
} catch (ClassNotFoundException e) {
throw new QueryException(e);
} catch (InstantiationException e) {
throw new QueryException(e);
} catch (IllegalAccessException e) {
throw new QueryException(e);
} catch (InvocationTargetException e) {
throw new QueryException(e);
}
} else {
factoryExpressionUsed = true;
}

12
querydsl-jpa/src/test/java/com/mysema/query/_derby/DerbyJPAEclipseLinkTest.java
View File

@ -49,17 +49,7 @@ public class DerbyJPAEclipseLinkTest extends AbstractJPATest{
public void Hint(){
// FIXME
}
@Override
public void TupleProjection(){
// FIXME : custom projections don't work
}
@Override
public void ArrayProjection(){
// FIXME : custom projections don't work
}
@Override
public void Connection_Access(){
// cannot unwrap to Connection instance