From 67cca1814761620b9ecc8947a7f0ed08d56def4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Mon, 14 Apr 2014 23:47:54 +0300
Subject: [PATCH 01/20] Change class hierarchy

---
 .../query/jdo/sql/AbstractSQLQuery.java       | 453 ++++++++----------
 .../com/mysema/query/jdo/sql/JDOSQLQuery.java | 253 +---------
 .../query/jpa/sql/AbstractJPASQLQuery.java    |  31 +-
 3 files changed, 231 insertions(+), 506 deletions(-)

diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
index 69cfc89d8..2067b92cf 100644
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
@@ -13,37 +13,28 @@
  */
 package com.mysema.query.jdo.sql;
 
-import javax.annotation.Nullable;
-
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
+import com.google.common.collect.Lists;
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.mysema.query.*;
 import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.RelationalFunctionCall;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLCommonQuery;
-import com.mysema.query.sql.SQLOps;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.Union;
-import com.mysema.query.sql.UnionImpl;
-import com.mysema.query.sql.UnionUtils;
-import com.mysema.query.sql.WithBuilder;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.support.ProjectableQuery;
+import com.mysema.query.sql.ProjectableSQLQuery;
+import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.EntityPath;
 import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.query.types.template.SimpleTemplate;
+import com.mysema.query.types.FactoryExpression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Base class for JDO based SQLQuery implementations
@@ -53,7 +44,29 @@ import com.mysema.query.types.template.SimpleTemplate;
  * @param <T>
  */
 @SuppressWarnings("rawtypes")
-public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T> & com.mysema.query.Query<T>> extends ProjectableQuery<T> implements SQLCommonQuery<T> {
+public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T> & com.mysema.query.Query<T>> extends ProjectableSQLQuery<T> {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(JDOSQLQuery.class);
+
+    private final Closeable closeable = new Closeable() {
+        @Override
+        public void close() throws IOException {
+            AbstractSQLQuery.this.close();
+        }
+    };
+
+    protected final boolean detach;
+
+    private List<Object> orderedConstants = new ArrayList<Object>();
+
+    @Nullable
+    protected final PersistenceManager persistenceManager;
+
+    protected List<Query> queries = new ArrayList<Query>(2);
+
+    @Nullable
+    protected FactoryExpression<?> projection;
 
     protected final QueryMixin<T> queryMixin;
 
@@ -62,261 +75,213 @@ public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T> & com.mysem
 
     protected boolean unionAll;
 
-    protected final Configuration configuration;
-
     @SuppressWarnings("unchecked")
-    public AbstractSQLQuery(QueryMetadata metadata, Configuration conf) {
-        super(new QueryMixin<T>(metadata, false));
-        this.configuration = conf;
+    public AbstractSQLQuery(QueryMetadata metadata, Configuration conf, PersistenceManager persistenceManager,
+                            boolean detach) {
+        super(new QueryMixin<T>(metadata, false), conf);
         this.queryMixin = super.queryMixin;
         this.queryMixin.setSelf((T)this);
+        this.persistenceManager = persistenceManager;
+        this.detach = detach;
+    }
+
+    public void close() {
+        for (Query query : queries) {
+            query.closeAll();
+        }
     }
 
     @Override
     public long count() {
-        return uniqueResult(Wildcard.countAsInt);
+        Query query = createQuery(true);
+        query.setUnique(true);
+        reset();
+        Long rv = (Long) execute(query, true);
+        if (rv != null) {
+            return rv.longValue();
+        } else {
+            throw new QueryException("Query returned null");
+        }
     }
 
-    @Override
-    public boolean exists() {
-        return limit(1).uniqueResult(NumberTemplate.ONE) != null;
+    private Query createQuery(boolean forCount) {
+        SQLSerializer serializer = new SQLSerializer(configuration);
+        if (union != null) {
+            serializer.serializeUnion(union, queryMixin.getMetadata(), unionAll);
+        } else {
+            serializer.serialize(queryMixin.getMetadata(), forCount);
+        }
+
+
+        // create Query
+        if (logger.isDebugEnabled()) {
+            logger.debug(serializer.toString());
+        }
+        Query query = persistenceManager.newQuery("javax.jdo.query.SQL",serializer.toString());
+        orderedConstants = serializer.getConstants();
+        queries.add(query);
+
+        if (!forCount) {
+            List<? extends Expression<?>> projection = queryMixin.getMetadata().getProjection();
+            if (projection.get(0) instanceof FactoryExpression) {
+                this.projection = (FactoryExpression<?>)projection.get(0);
+            }
+        } else {
+            query.setResultClass(Long.class);
+        }
+
+        return query;
     }
 
-    public T from(Expression<?> arg) {
-        return queryMixin.from(arg);
-    }
-
-    @Override
-    public T from(Expression<?>... args) {
-        return queryMixin.from(args);
-    }
-
-    @Override
     @SuppressWarnings("unchecked")
-    public T from(SubQueryExpression<?> subQuery, Path<?> alias) {
-        return queryMixin.from(ExpressionUtils.as((Expression) subQuery, alias));
+    private <T> T detach(T results) {
+        if (results instanceof Collection) {
+            return (T) persistenceManager.detachCopyAll(results);
+        } else {
+            return persistenceManager.detachCopy(results);
+        }
+    }
+
+    private Object project(FactoryExpression<?> expr, Object row) {
+        if (row == null) {
+            return null;
+        } else if (row.getClass().isArray()) {
+            return expr.newInstance((Object[])row);
+        } else {
+            return expr.newInstance(new Object[]{row});
+        }
+    }
+
+    private Object execute(Query query, boolean forCount) {
+        Object rv;
+        if (!orderedConstants.isEmpty()) {
+            rv = query.executeWithArray(orderedConstants.toArray());
+        } else {
+            rv = query.execute();
+        }
+        if (isDetach()) {
+            rv = detach(rv);
+        }
+        if (projection != null && !forCount) {
+            if (rv instanceof List) {
+                List<?> original = (List<?>)rv;
+                rv = Lists.newArrayList();
+                for (Object o : original) {
+                    ((List)rv).add(project(projection, o));
+                }
+            } else {
+                rv = project(projection, rv);
+            }
+        }
+        return rv;
     }
 
     @Override
-    public T fullJoin(EntityPath<?> o) {
-        return queryMixin.fullJoin(o);
-    }
-
-    @Override
-    public <E> T fullJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    public <E> T fullJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.fullJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    public T fullJoin(SubQueryExpression<?> o, Path<?> alias) {
-        return queryMixin.fullJoin(o, alias);
-    }
-
     public QueryMetadata getMetadata() {
         return queryMixin.getMetadata();
     }
 
-    @Override
-    public T innerJoin(EntityPath<?> o) {
-        return queryMixin.innerJoin(o);
+    public boolean isDetach() {
+        return detach;
     }
 
     @Override
-    public <E> T innerJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.innerJoin(target, alias);
+    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
+        return iterate(queryMixin.createProjection(args));
     }
 
     @Override
-    public <E> T innerJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.innerJoin(entity).on(key.on(entity));
+    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
+        return new IteratorAdapter<RT>(list(projection).iterator(), closeable);
     }
 
     @Override
-    public T innerJoin(SubQueryExpression<?> o, Path<?> alias) {
-        return queryMixin.innerJoin(o, alias);
-    }
-
-    @Override
-    public T join(EntityPath<?> o) {
-        return queryMixin.join(o);
-    }
-
-    @Override
-    public <E> T join(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    public <E> T join(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.join(entity).on(key.on(entity));
-    }
-
-    @Override
-    public T join(SubQueryExpression<?> o, Path<?> alias) {
-        return queryMixin.join(o, alias);
-    }
-
-    @Override
-    public T leftJoin(EntityPath<?> o) {
-        return queryMixin.leftJoin(o);
-    }
-
-    @Override
-    public <E> T leftJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    public <E> T leftJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.leftJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    public T leftJoin(SubQueryExpression<?> o, Path<?> alias) {
-        return queryMixin.leftJoin(o, alias);
-    }
-
-    public T on(Predicate condition) {
-        return queryMixin.on(condition);
-    }
-
-    @Override
-    public T on(Predicate... conditions) {
-        return queryMixin.on(conditions);
-    }
-
-    @Override
-    public T rightJoin(EntityPath<?> o) {
-        return queryMixin.rightJoin(o);
-    }
-
-    @Override
-    public <E> T rightJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    @Override
-    public <E> T rightJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.rightJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    public T rightJoin(SubQueryExpression<?> o, Path<?> alias) {
-        return queryMixin.rightJoin(o, alias);
-    }
-
-    @Override
-    public T addJoinFlag(String flag) {
-        return addJoinFlag(flag, JoinFlag.Position.BEFORE_TARGET);
+    public List<Tuple> list(Expression<?>... args) {
+        return list(queryMixin.createProjection(args));
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public T addJoinFlag(String flag, JoinFlag.Position position) {
-        queryMixin.addJoinFlag(new JoinFlag(flag, position));
-        return (T)this;
+    public <RT> List<RT> list(Expression<RT> expr) {
+        queryMixin.addProjection(expr);
+        Object rv = execute(createQuery(false), false);
+        reset();
+        return rv instanceof List ? (List<RT>)rv : Collections.singletonList((RT) rv);
     }
 
     @Override
-    public T addFlag(Position position, String prefix, Expression<?> expr) {
-        Expression<?> flag = SimpleTemplate.create(expr.getType(), prefix + "{0}", expr);
-        return queryMixin.addFlag(new QueryFlag(position, flag));
+    public SearchResults<Tuple> listResults(Expression<?>... args) {
+        return listResults(queryMixin.createProjection(args));
     }
 
     @Override
-    public T addFlag(Position position, String flag) {
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    @Override
-    public T addFlag(Position position, Expression<?> flag) {
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    public <RT> Union<RT> union(ListSubQuery<RT>... sq) {
-        return innerUnion(sq);
-    }
-
-    public <RT> Union<RT> union(SubQueryExpression<RT>... sq) {
-        return innerUnion(sq);
-    }
-
-    public <RT> Union<RT> unionAll(ListSubQuery<RT>... sq) {
-        unionAll = true;
-        return innerUnion(sq);
-    }
-
-    public <RT> Union<RT> unionAll(SubQueryExpression<RT>... sq) {
-        unionAll = true;
-        return innerUnion(sq);
-    }
-
-    public <RT> T union(Path<?> alias, ListSubQuery<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, false));
-    }
-
-    public <RT> T union(Path<?> alias, SubQueryExpression<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, false));
-    }
-
-    public <RT> T unionAll(Path<?> alias, ListSubQuery<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, true));
-    }
-
-    public <RT> T unionAll(Path<?> alias, SubQueryExpression<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, true));
-    }
-
-    @Override
-    public T withRecursive(Path<?> alias, SubQueryExpression<?> query) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, query);
-    }
-
-    @Override
-    public T withRecursive(Path<?> alias, Expression<?> query) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, query);
-    }
-
-    @Override
-    public WithBuilder<T> withRecursive(Path<?> alias, Path<?>... columns) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, columns);
-    }
-
-    @Override
-    public T with(Path<?> alias, SubQueryExpression<?> query) {
-        Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
-    }
-
-    @Override
-    public T with(Path<?> alias, Expression<?> query) {
-        Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
-    }
-
-    @Override
-    public WithBuilder<T> with(Path<?> alias, Path<?>... columns) {
-        Expression<?> columnsCombined = ExpressionUtils.list(Object.class, columns);
-        Expression<?> aliasCombined = Expressions.operation(alias.getType(), SQLOps.WITH_COLUMNS, alias, columnsCombined);
-        return new WithBuilder<T>(queryMixin, aliasCombined);
-    }
-
     @SuppressWarnings("unchecked")
-    private <RT> Union<RT> innerUnion(SubQueryExpression<?>... sq) {
-        queryMixin.getMetadata().setValidate(false);
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            throw new IllegalArgumentException("Don't mix union and from");
+    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
+        queryMixin.addProjection(expr);
+        Query countQuery = createQuery(true);
+        countQuery.setUnique(true);
+        long total = (Long) execute(countQuery, true);
+        if (total > 0) {
+            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+            Query query = createQuery(false);
+            reset();
+            return new SearchResults<RT>((List<RT>) execute(query, false), modifiers, total);
+        } else {
+            reset();
+            return SearchResults.emptyResults();
         }
-        this.union = UnionUtils.union(sq, unionAll);
-        return new UnionImpl<T, RT>((T)this, sq[0].getMetadata().getProjection());
     }
 
+    private void reset() {
+        queryMixin.getMetadata().reset();
+    }
+
+    @Override
+    public String toString() {
+        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
+            SQLSerializer serializer = new SQLSerializer(configuration);
+            serializer.serialize(queryMixin.getMetadata(), false);
+            return serializer.toString().trim();
+        } else {
+            return super.toString();
+        }
+    }
+
+
+    @Override
+    @Nullable
+    public Tuple uniqueResult(Expression<?>... args) {
+        return uniqueResult(queryMixin.createProjection(args));
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public <RT> RT uniqueResult(Expression<RT> expr) {
+        queryMixin.addProjection(expr);
+        return (RT)uniqueResult();
+    }
+
+    @Nullable
+    private Object uniqueResult() {
+        if (getMetadata().getModifiers().getLimit() == null) {
+            limit(2);
+        }
+        Query query = createQuery(false);
+        reset();
+        Object rv = execute(query, false);
+        if (rv instanceof List) {
+            List<?> list = (List<?>)rv;
+            if (!list.isEmpty()) {
+                if (list.size() > 1) {
+                    throw new NonUniqueResultException();
+                }
+                return list.get(0);
+            } else {
+                return null;
+            }
+        } else {
+            return rv;
+        }
+    }
 }
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
index 7744b72c3..23321a299 100644
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
@@ -13,35 +13,14 @@
  */
 package com.mysema.query.jdo.sql;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
 import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
 import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
 import com.mysema.query.sql.Configuration;
 import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
+
+import javax.annotation.Nullable;
+import javax.jdo.PersistenceManager;
 
 /**
  * JDOSQLQuery is an SQLQuery implementation that uses JDO's SQL query functionality
@@ -52,28 +31,6 @@ import com.mysema.query.types.FactoryExpression;
  */
 public final class JDOSQLQuery extends AbstractSQLQuery<JDOSQLQuery> {
 
-    private static final Logger logger = LoggerFactory.getLogger(JDOSQLQuery.class);
-
-    private final Closeable closeable = new Closeable() {
-        @Override
-        public void close() throws IOException {
-            JDOSQLQuery.this.close();
-        }
-    };
-
-    private final boolean detach;
-
-    private List<Object> orderedConstants = new ArrayList<Object>();
-
-    @Nullable
-    private final PersistenceManager persistenceManager;
-
-    private List<Query> queries = new ArrayList<Query>(2);
-
-    @Nullable
-    private FactoryExpression<?> projection;
-
-
     public JDOSQLQuery(@Nullable PersistenceManager persistenceManager, SQLTemplates templates) {
         this(persistenceManager, new Configuration(templates), new DefaultQueryMetadata().noValidate(), false);
     }
@@ -86,210 +43,18 @@ public final class JDOSQLQuery extends AbstractSQLQuery<JDOSQLQuery> {
             @Nullable PersistenceManager persistenceManager,
             Configuration configuration,
             QueryMetadata metadata, boolean detach) {
-        super(metadata, configuration);
-        this.persistenceManager = persistenceManager;
-        this.detach = detach;
-    }
-
-    public void close() {
-        for (Query query : queries) {
-            query.closeAll();
-        }
+        super(metadata, configuration, persistenceManager, detach);
     }
 
     @Override
-    public long count() {
-        Query query = createQuery(true);
-        query.setUnique(true);
-        reset();
-        Long rv = (Long) execute(query, true);
-        if (rv != null) {
-            return rv.longValue();
-        } else {
-            throw new QueryException("Query returned null");
-        }
-    }
-
-    private Query createQuery(boolean forCount) {
-        SQLSerializer serializer = new SQLSerializer(configuration);
-        if (union != null) {
-            serializer.serializeUnion(union, queryMixin.getMetadata(), unionAll);
-        } else {
-            serializer.serialize(queryMixin.getMetadata(), forCount);
-        }
-
-
-        // create Query
-        if (logger.isDebugEnabled()) {
-            logger.debug(serializer.toString());
-        }
-        Query query = persistenceManager.newQuery("javax.jdo.query.SQL",serializer.toString());
-        orderedConstants = serializer.getConstants();
-        queries.add(query);
-
-        if (!forCount) {
-            List<? extends Expression<?>> projection = queryMixin.getMetadata().getProjection();
-            if (projection.get(0) instanceof FactoryExpression) {
-                this.projection = (FactoryExpression<?>)projection.get(0);
-            }
-        } else {
-            query.setResultClass(Long.class);
-        }
-
+    public JDOSQLQuery clone() {
+        JDOSQLQuery query = new JDOSQLQuery(persistenceManager, configuration, getMetadata().clone(), detach);
+        query.clone(this);
         return query;
     }
 
-    @SuppressWarnings("unchecked")
-    private <T> T detach(T results) {
-        if (results instanceof Collection) {
-            return (T) persistenceManager.detachCopyAll(results);
-        } else {
-            return persistenceManager.detachCopy(results);
-        }
-    }
-
-    private Object project(FactoryExpression<?> expr, Object row) {
-        if (row == null) {
-            return null;
-        } else if (row.getClass().isArray()) {
-            return expr.newInstance((Object[])row);
-        } else {
-            return expr.newInstance(new Object[]{row});
-        }
-    }
-
-    private Object execute(Query query, boolean forCount) {
-        Object rv;
-        if (!orderedConstants.isEmpty()) {
-            rv = query.executeWithArray(orderedConstants.toArray());
-        } else {
-            rv = query.execute();
-        }
-        if (isDetach()) {
-            rv = detach(rv);
-        }
-        if (projection != null && !forCount) {
-            if (rv instanceof List) {
-                List<?> original = (List<?>)rv;
-                rv = Lists.newArrayList();
-                for (Object o : original) {
-                    ((List)rv).add(project(projection, o));
-                }
-            } else {
-                rv = project(projection, rv);
-            }
-        }
-        return rv;
-    }
-
     @Override
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
+    protected SQLSerializer createSerializer() {
+        return new SQLSerializer(configuration);
     }
-
-    public boolean isDetach() {
-        return detach;
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return iterate(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        return new IteratorAdapter<RT>(list(projection).iterator(), closeable);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> List<RT> list(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Object rv = execute(createQuery(false), false);
-        reset();
-        return rv instanceof List ? (List<RT>)rv : Collections.singletonList((RT)rv);
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Query countQuery = createQuery(true);
-        countQuery.setUnique(true);
-        long total = (Long) execute(countQuery, true);
-        if (total > 0) {
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            Query query = createQuery(false);
-            reset();
-            return new SearchResults<RT>((List<RT>) execute(query, false), modifiers, total);
-        } else {
-            reset();
-            return SearchResults.emptyResults();
-        }
-    }
-
-    private void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    @Override
-    public String toString() {
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            SQLSerializer serializer = new SQLSerializer(configuration);
-            serializer.serialize(queryMixin.getMetadata(), false);
-            return serializer.toString().trim();
-        } else {
-            return super.toString();
-        }
-    }
-
-
-    @Override
-    @Nullable
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        return (RT)uniqueResult();
-    }
-
-    @Nullable
-    private Object uniqueResult() {
-        if (getMetadata().getModifiers().getLimit() == null) {
-            limit(2);
-        }
-        Query query = createQuery(false);
-        reset();
-        Object rv = execute(query, false);
-        if (rv instanceof List) {
-            List<?> list = (List<?>)rv;
-            if (!list.isEmpty()) {
-                if (list.size() > 1) {
-                    throw new NonUniqueResultException();
-                }
-                return list.get(0);
-            } else {
-                return null;
-            }
-        } else {
-            return rv;
-        }
-    }
-
-
 }
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
index c06033302..aeb8c077a 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
@@ -13,27 +13,10 @@
  */
 package com.mysema.query.jpa.sql;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
+import com.mysema.query.*;
 import com.mysema.query.jpa.AbstractSQLQuery;
 import com.mysema.query.jpa.NativeSQLSerializer;
 import com.mysema.query.jpa.QueryHandler;
@@ -43,6 +26,17 @@ import com.mysema.query.sql.Configuration;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.FactoryExpression;
 import com.mysema.query.types.FactoryExpressionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * AbstractJPASQLQuery is the base class for JPA Native SQL queries
@@ -70,6 +64,7 @@ public abstract class AbstractJPASQLQuery<Q extends AbstractJPASQLQuery<Q>> exte
     @Nullable
 
     protected FactoryExpression<?> projection;
+
     public AbstractJPASQLQuery(EntityManager em, Configuration configuration) {
         this(em, configuration, new DefaultQueryMetadata().noValidate());
     }

From b2c986c2f11d3090b86ef0833b6b666a0769cea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Tue, 15 Apr 2014 22:06:45 +0300
Subject: [PATCH 02/20] Add enforcer config

---
 .../mysema/query/types/expr/CaseBuilder.java  | 15 ++++++++++
 querydsl-root/pom.xml                         | 29 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java
index cdf4a19fd..6a3827d8e 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java
@@ -259,6 +259,11 @@ public final class CaseBuilder {
             return thenDate(ConstantImpl.create(date));
         }
 
+        @Deprecated
+        public Cases<java.sql.Date, DateExpression<java.sql.Date>> thenDate(java.sql.Date date) {
+            return then(date);
+        }
+
         // DateTime
 
         public <T extends Comparable> Cases<T, DateTimeExpression<T>> then(DateTimeExpression<T> expr) {
@@ -279,10 +284,20 @@ public final class CaseBuilder {
             return thenDateTime(ConstantImpl.create(ts));
         }
 
+        @Deprecated
+        public Cases<Timestamp, DateTimeExpression<Timestamp>> thenDateTime(Timestamp ts) {
+            return then(ts);
+        }
+
         public Cases<java.util.Date, DateTimeExpression<java.util.Date>> then(java.util.Date date) {
             return thenDateTime(ConstantImpl.create(date));
         }
 
+        @Deprecated
+        public Cases<java.util.Date, DateTimeExpression<java.util.Date>> thenDateTime(java.util.Date date) {
+            return then(date);
+        }
+
         // Enum
 
         public <T extends Enum<T>> Cases<T,EnumExpression<T>> then(EnumExpression<T> expr) {
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 3e3f220d3..b2bca7c4f 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -183,6 +183,35 @@
     </pluginManagement>
     
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.3.1</version>
+        <executions>
+          <execution>
+            <id>check</id>
+            <phase>verify</phase> 
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
+                  <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
+                  <dumpDetails>true</dumpDetails>
+                </requireBackwardCompatibility>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.semver</groupId>
+            <artifactId>enforcer-rule</artifactId>
+            <version>0.9.22</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>       
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>

From cc86014125d4e51850869d726055a0b42387eda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Tue, 15 Apr 2014 22:47:00 +0300
Subject: [PATCH 03/20] Add semantic versioning rule

---
 querydsl-root/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index b2bca7c4f..2c625f6ef 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -200,6 +200,9 @@
                   <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
                   <dumpDetails>true</dumpDetails>
                 </requireBackwardCompatibility>
+                <requireSemanticVersioningConformance implementation="org.semver.enforcer.RequireSemanticVersioningConformance">
+                  <dumpDetails>true</dumpDetails>
+                </requireSemanticVersioningConformance>
               </rules>
             </configuration>
           </execution>

From 4cf4b8ff1993c55a159213f71fbc36e1197bb362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 16 Apr 2014 22:52:09 +0300
Subject: [PATCH 04/20] Improve backwards compatibility

---
 .../src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java  | 4 ++--
 .../src/main/java/com/mysema/query/sql/AbstractSQLQuery.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java
index 0cb4b354f..f253c24d2 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java
@@ -50,11 +50,11 @@ public abstract class AbstractSQLQuery<Q extends AbstractSQLQuery<Q>> extends Pr
         this.queryMixin.setSelf((Q) this);
     }
 
-    protected static boolean isEntityExpression(Expression<?> expr) {
+    protected boolean isEntityExpression(Expression<?> expr) {
         return expr instanceof EntityPath || expr.getType().isAnnotationPresent(Entity.class);
     }
 
-    protected static Expression<?> extractEntityExpression(Expression<?> expr) {
+    protected Expression<?> extractEntityExpression(Expression<?> expr) {
         if (expr instanceof Operation) {
             return ((Operation<?>)expr).getArg(0);
         } else if (expr instanceof TemplateExpression) {
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
index 008c67f8b..293a52a5f 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
@@ -165,7 +165,7 @@ public abstract class AbstractSQLQuery<Q extends AbstractSQLQuery<Q>> extends Pr
     }
     
     @Override
-    public final <RT> CloseableIterator<RT> iterate(Expression<RT> expr) {
+    public <RT> CloseableIterator<RT> iterate(Expression<RT> expr) {
         expr = queryMixin.addProjection(expr);
         return iterateSingle(queryMixin.getMetadata(), expr);
     }

From 67753fd4cdf817625dc9895b7dd601f4225c276a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 16 Apr 2014 22:52:26 +0300
Subject: [PATCH 05/20] Use patched version of semantic versioning

---
 querydsl-root/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 2c625f6ef..78ea1f822 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -211,7 +211,7 @@
           <dependency>
             <groupId>org.semver</groupId>
             <artifactId>enforcer-rule</artifactId>
-            <version>0.9.22</version>
+            <version>0.9.23-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>

From 71df39f3cd6a1d946f6988d284277d5eaf7dbc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 17 Apr 2014 14:16:16 +0300
Subject: [PATCH 06/20] Remove enforcer config

---
 querydsl-root/pom.xml | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 78ea1f822..3e3f220d3 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -183,38 +183,6 @@
     </pluginManagement>
     
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
-        <executions>
-          <execution>
-            <id>check</id>
-            <phase>verify</phase> 
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
-                  <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
-                  <dumpDetails>true</dumpDetails>
-                </requireBackwardCompatibility>
-                <requireSemanticVersioningConformance implementation="org.semver.enforcer.RequireSemanticVersioningConformance">
-                  <dumpDetails>true</dumpDetails>
-                </requireSemanticVersioningConformance>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.semver</groupId>
-            <artifactId>enforcer-rule</artifactId>
-            <version>0.9.23-SNAPSHOT</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <plugin>       
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>

From 47bf704919ec7bab5f10d18a563e5517c7e5fb64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 17 Apr 2014 16:23:54 +0300
Subject: [PATCH 07/20] Extend JDBC Type to provide literal serialization

---
 querydsl-sql/pom.xml                          | 424 +++++++++---------
 .../com/mysema/query/sql/Configuration.java   |  15 +
 .../com/mysema/query/sql/DerbyTemplates.java  |  19 +-
 .../com/mysema/query/sql/OracleTemplates.java |  16 +-
 .../com/mysema/query/sql/SQLSerializer.java   |  34 +-
 .../mysema/query/sql/SQLServerTemplates.java  |  19 +-
 .../com/mysema/query/sql/SQLTemplates.java    |  92 +---
 .../com/mysema/query/sql/SQLiteTemplates.java |  32 +-
 .../sql/teradata/SetQueryBandClause.java      |  18 +-
 .../query/sql/types/AbstractDateTimeType.java |  51 +++
 .../mysema/query/sql/types/AbstractType.java  |  17 +-
 .../mysema/query/sql/types/CalendarType.java  |   7 +-
 .../mysema/query/sql/types/DateTimeType.java  |  15 +-
 .../com/mysema/query/sql/types/DateType.java  |  13 +-
 .../query/sql/types/LocalDateTimeType.java    |  15 +-
 .../mysema/query/sql/types/LocalDateType.java |  15 +-
 .../mysema/query/sql/types/LocalTimeType.java |  15 +-
 .../com/mysema/query/sql/types/TimeType.java  |  13 +-
 .../mysema/query/sql/types/TimestampType.java |  13 +-
 .../java/com/mysema/query/sql/types/Type.java |  11 +-
 .../mysema/query/sql/types/UtilDateType.java  |   7 +-
 .../java/com/mysema/query/SelectBase.java     |   2 +-
 .../mysema/query/sql/SQLTemplatesTest.java    |  39 +-
 23 files changed, 463 insertions(+), 439 deletions(-)
 create mode 100644 querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 60facda97..360321fd8 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -1,214 +1,214 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.mysema.querydsl</groupId>
-    <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
-  </parent>
-
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-sql</artifactId>
-  <name>Querydsl - SQL support</name>
-  <description>SQL support for Querydsl</description>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>    
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.6</version>
-    </dependency>    
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>1.0.0.GA</version>
-    </dependency>
-       
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-        <scope>provided</scope>      
-    </dependency>    
-    
-    <dependency>  
-      <groupId>javax.inject</groupId>  
-      <artifactId>javax.inject</artifactId>  
-      <version>1</version>  
-    </dependency>    
-
-    <!-- test -->
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>${hsqldb.version}</version>
-      <scope>test</scope>
-      <!-- license : TODO -->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>${mysql.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>${postgresql.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>ojdbc6</artifactId>
-      <version>${oracle.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <version>${jtds.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>cubrid</groupId>
-      <artifactId>cubrid-jdbc</artifactId>
-      <version>${cubrid.version}</version>
-      <scope>test</scope>
-    </dependency>    
-
-    <dependency>
-      <groupId>org.xerial</groupId>
-      <artifactId>sqlite-jdbc</artifactId>
-      <version>${sqlite.version}</version>
-      <scope>test</scope>
-    </dependency>
-   
-    <dependency>
-      <groupId>com.teradata</groupId>
-      <artifactId>teradata-jdbc</artifactId>
-      <version>${teradata.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.teradata</groupId>
-      <artifactId>teradata-config</artifactId>
-      <version>${teradata.version}</version>
-      <scope>test</scope>
-    </dependency>
-            
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-core</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>    
-    
-    <dependency>
-      <groupId>jdepend</groupId>
-      <artifactId>jdepend</artifactId>
-      <version>2.9.1</version>
-      <scope>test</scope>
-    </dependency>    
-    
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>   
-    
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test-jar</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-                <name>derby.stream.error.file</name>
-                <value>target/derby.log</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>         
-      
-      <!-- 
-      <plugin>
-        <groupId>com.mysema.querydsl</groupId>
-        <artifactId>querydsl-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-export</goal>
-            </goals>
-          </execution>            
-        </executions>
-        <configuration>
-          <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-          <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-          <packageName>com.mysema.query.sql.domain2</packageName>
-          <targetFolder>target/generated-test-sources/java</targetFolder>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-       -->
-    </plugins>
-  </build>
-  
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.mysema.querydsl</groupId>
+    <artifactId>querydsl-root</artifactId>
+    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <relativePath>../querydsl-root/pom.xml</relativePath> 
+  </parent>
+
+  <groupId>com.mysema.querydsl</groupId>
+  <artifactId>querydsl-sql</artifactId>
+  <name>Querydsl - SQL support</name>
+  <description>SQL support for Querydsl</description>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.mysema.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>    
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.6</version>
+    </dependency>    
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+    </dependency>
+       
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+        <scope>provided</scope>      
+    </dependency>    
+    
+    <dependency>  
+      <groupId>javax.inject</groupId>  
+      <artifactId>javax.inject</artifactId>  
+      <version>1</version>  
+    </dependency>    
+
+    <!-- test -->
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>${hsqldb.version}</version>
+      <scope>test</scope>
+      <!-- license : TODO -->
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>${mysql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.oracle</groupId>
+      <artifactId>ojdbc6</artifactId>
+      <version>${oracle.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.jtds</groupId>
+      <artifactId>jtds</artifactId>
+      <version>${jtds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>${h2.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>cubrid</groupId>
+      <artifactId>cubrid-jdbc</artifactId>
+      <version>${cubrid.version}</version>
+      <scope>test</scope>
+    </dependency>    
+
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>${sqlite.version}</version>
+      <scope>test</scope>
+    </dependency>
+   
+    <dependency>
+      <groupId>com.teradata</groupId>
+      <artifactId>teradata-jdbc</artifactId>
+      <version>${teradata.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.teradata</groupId>
+      <artifactId>teradata-config</artifactId>
+      <version>${teradata.version}</version>
+      <scope>test</scope>
+    </dependency>
+            
+    <dependency>
+      <groupId>com.mysema.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>    
+    
+    <dependency>
+      <groupId>jdepend</groupId>
+      <artifactId>jdepend</artifactId>
+      <version>2.9.1</version>
+      <scope>test</scope>
+    </dependency>    
+    
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.springsource.bundlor</groupId>
+        <artifactId>com.springsource.bundlor.maven</artifactId>
+      </plugin>   
+    
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+                <name>derby.stream.error.file</name>
+                <value>target/derby.log</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>         
+      
+      <!-- 
+      <plugin>
+        <groupId>com.mysema.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-export</goal>
+            </goals>
+          </execution>            
+        </executions>
+        <configuration>
+          <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
+          <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
+          <packageName>com.mysema.query.sql.domain2</packageName>
+          <targetFolder>target/generated-test-sources/java</targetFolder>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+       -->
+    </plugins>
+  </build>
+  
 </project>
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java b/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
index 0cdbe03d8..0b508def3 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
@@ -73,6 +73,21 @@ public final class Configuration {
         }
     }
 
+    /**
+     * Get the literal representation of the given constant
+     *
+     * @param o
+     * @return
+     */
+    public String asLiteral(Object o) {
+        Type type = javaTypeMapping.getType(o.getClass());
+        if (type != null) {
+            return templates.serialize(type.getLiteral(o), type.getSQLTypes()[0]);
+        } else {
+            throw new IllegalArgumentException("Unsupported literal type " + o.getClass().getName());
+        }
+    }
+
     public SQLTemplates getTemplates() {
         return templates;
     }
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java
index 513aa0b3e..17c53fd73 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java
@@ -17,6 +17,8 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.types.Ops;
 
+import java.sql.Types;
+
 /**
  * DerbyTemplates is an SQL dialect for Derby
  *
@@ -107,15 +109,16 @@ public class DerbyTemplates extends SQLTemplates {
     }
 
     @Override
-    public String asLiteral(DateTimeType type, String literal) {
-        // JDBC escape syntax
-        String keyword = "ts";
-        if (type == DateTimeType.DATE) {
-            keyword = "d";
-        } else if (type == DateTimeType.TIME) {
-            keyword = "t";
+    public String serialize(String literal, int jdbcType) {
+        if (jdbcType == Types.TIMESTAMP) {
+            return "{ts '" + literal + "'}";
+        } else if (jdbcType == Types.DATE) {
+            return "{d '" + literal + "'}";
+        } else if (jdbcType == Types.TIME) {
+            return "{t '" + literal + "'}";
+        } else {
+            return super.serialize(literal, jdbcType);
         }
-        return "{" + keyword + " '" + literal + "'}";
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java
index 2d5199d36..92988d5ce 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java
@@ -13,9 +13,6 @@
  */
 package com.mysema.query.sql;
 
-import java.math.BigInteger;
-import java.util.List;
-
 import com.mysema.commons.lang.Pair;
 import com.mysema.query.QueryFlag.Position;
 import com.mysema.query.QueryMetadata;
@@ -24,6 +21,10 @@ import com.mysema.query.types.Expression;
 import com.mysema.query.types.Ops;
 import com.mysema.query.types.Path;
 
+import java.math.BigInteger;
+import java.sql.Types;
+import java.util.List;
+
 /**
  * OracleTemplates is an SQL dialect for Oracle
  *
@@ -134,12 +135,11 @@ public class OracleTemplates extends SQLTemplates {
     }
 
     @Override
-    public String asLiteral(DateTimeType type, String literal) {
-        if (type == DateTimeType.TIME) {
-            // Oracle doesn't support the time type
-            return "(timestamp '1970-01-01 " + literal + "')";
+    public String serialize(String literal, int jdbcType) {
+        if (jdbcType == Types.TIME) {
+            return "(timestamp '1970-01-01 " + literal + "'}";
         } else {
-            return super.asLiteral(type, literal);
+            return super.serialize(literal, jdbcType);
         }
     }
 
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
index e13315ef1..7a0b65808 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
@@ -13,15 +13,6 @@
  */
 package com.mysema.query.sql;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -32,24 +23,11 @@ import com.mysema.query.QueryFlag;
 import com.mysema.query.QueryFlag.Position;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.support.SerializerBase;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Order;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.Template;
+import com.mysema.query.types.*;
 import com.mysema.query.types.Template.Element;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateFactory;
+
+import javax.annotation.Nullable;
+import java.util.*;
 
 /**
  * SqlSerializer serializes Querydsl queries into SQL
@@ -705,12 +683,12 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
                     if (!first) {
                         append(COMMA);
                     }
-                    append(templates.asLiteral(o));
+                    append(configuration.asLiteral(o));
                     first = false;
                 }
                 append(")");
             } else {
-                append(templates.asLiteral(constant));
+                append(configuration.asLiteral(constant));
             }
         } else if (constant instanceof Collection) {
             append("(");
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java
index b7cc5dbf2..a0af71a05 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java
@@ -20,6 +20,8 @@ import com.mysema.query.QueryModifiers;
 import com.mysema.query.support.Expressions;
 import com.mysema.query.types.Ops;
 
+import java.sql.Types;
+
 /**
  * SQLServerTemplates is an SQL dialect for Microsoft SQL Server
  *
@@ -115,15 +117,16 @@ public class SQLServerTemplates extends SQLTemplates {
     }
 
     @Override
-    public String asLiteral(DateTimeType type, String literal) {
-        // JDBC escape syntax
-        String keyword = "ts";
-        if (type == DateTimeType.DATE) {
-            keyword = "d";
-        } else if (type == DateTimeType.TIME) {
-            keyword = "t";
+    public String serialize(String literal, int jdbcType) {
+        if (jdbcType == Types.TIMESTAMP) {
+            return "{ts '" + literal + "'}";
+        } else if (jdbcType == Types.DATE) {
+            return "{d '" + literal + "'}";
+        } else if (jdbcType == Types.TIME) {
+            return "{t '" + literal + "'}";
+        } else {
+            return super.serialize(literal, jdbcType);
         }
-        return "{" + keyword + " '" + literal + "'}";
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java
index e73db54e8..818c71fbd 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java
@@ -13,20 +13,6 @@
  */
 package com.mysema.query.sql;
 
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
-import org.joda.time.ReadableInstant;
-import org.joda.time.ReadablePartial;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
 import com.google.common.primitives.Primitives;
 import com.mysema.commons.lang.Pair;
 import com.mysema.query.JoinType;
@@ -34,12 +20,11 @@ import com.mysema.query.QueryException;
 import com.mysema.query.QueryFlag.Position;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.Templates;
+import com.mysema.query.types.*;
+
+import java.lang.reflect.Field;
+import java.sql.Types;
+import java.util.*;
 
 /**
  * SQLTemplates extends Templates to provides SQL specific extensions
@@ -49,8 +34,6 @@ import com.mysema.query.types.Templates;
  */
 public class SQLTemplates extends Templates {
 
-    enum DateTimeType {DATE, TIME, DATETIME};
-
     public static final Expression<?> RECURSIVE = TemplateExpressionImpl.create(Object.class, "");
 
     public static final SQLTemplates DEFAULT = new SQLTemplates("\"",'\\',false);
@@ -94,12 +77,6 @@ public class SQLTemplates extends Templates {
 
     }
 
-    private static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
-
-    private static final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-
-    private static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss");
-
     private final Map<Class<?>, String> class2type = new HashMap<Class<?>, String>();
 
     private final String quoteStr;
@@ -365,35 +342,25 @@ public class SQLTemplates extends Templates {
         class2type.put(java.sql.Timestamp.class, "timestamp");
     }
 
-    public String asLiteral(Object o) {
-        if (o instanceof Character) {
-            return "'" + escapeLiteral(o.toString()) + "'";
-        } else if (o instanceof String) {
-            return "'" + escapeLiteral(o.toString()) + "'";
-        // java.util.Date
-        } else if (o instanceof java.util.Date) {
-            java.util.Date date = (java.util.Date)o;
-            if (o instanceof java.sql.Date) {
-                return asLiteral(DateTimeType.DATE, dateFormatter.print(date.getTime()));
-            } else if (o instanceof java.sql.Time) {
-                return asLiteral(DateTimeType.TIME, timeFormatter.print(date.getTime()));
-            } else {
-                return asLiteral(DateTimeType.DATETIME, dateTimeFormatter.print(date.getTime()));
-            }
-        // Joda time
-        } else if (o instanceof ReadablePartial) {
-            ReadablePartial partial = (ReadablePartial)o;
-            if (o instanceof LocalDate) {
-                return asLiteral(DateTimeType.DATE, dateFormatter.print(partial));
-            } else if (o instanceof LocalTime) {
-                return asLiteral(DateTimeType.TIME, timeFormatter.print(partial));
-            } else {
-                return asLiteral(DateTimeType.DATETIME, dateTimeFormatter.print(partial));
-            }
-        } else if (o instanceof ReadableInstant) {
-            return asLiteral(DateTimeType.DATETIME, dateTimeFormatter.print((ReadableInstant)o));
-        } else {
-            return o.toString();
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case Types.TIMESTAMP:
+                return "(timestamp '" + literal + "')";
+            case Types.DATE:
+                return "(date '" + literal + "')";
+            case Types.TIME:
+                return "(time '" + literal + "')";
+            case Types.CHAR:
+            case Types.CLOB:
+            case Types.LONGNVARCHAR:
+            case Types.LONGVARCHAR:
+            case Types.NCHAR:
+            case Types.NCLOB:
+            case Types.NVARCHAR:
+            case Types.VARCHAR:
+                return "'" + escapeLiteral(literal) + "'";
+            default:
+                return literal;
         }
     }
 
@@ -417,17 +384,6 @@ public class SQLTemplates extends Templates {
         return builder.toString();
     }
 
-    public String asLiteral(DateTimeType type, String literal) {
-        // SQL 92 standard
-        String keyword = "timestamp";
-        if (type == DateTimeType.DATE) {
-            keyword = "date";
-        } else if (type == DateTimeType.TIME) {
-            keyword = "time";
-        }
-        return "(" + keyword + " '" + literal + "')";
-    }
-
     protected void addClass2TypeMappings(String type, Class<?>... classes) {
         for (Class<?> cl : classes) {
             class2type.put(cl, type);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java
index 734760d67..77d264ce9 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java
@@ -14,7 +14,10 @@
 package com.mysema.query.sql;
 
 import com.mysema.query.types.Ops;
-import org.joda.time.*;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.sql.Types;
 
 /**
  * SQLiteTemplates is a SQL dialect for SQLite
@@ -24,6 +27,12 @@ import org.joda.time.*;
  */
 public class SQLiteTemplates extends SQLTemplates {
 
+    private static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    private static final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+
+    private static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss");
+
     public static Builder builder() {
         return new Builder() {
             @Override
@@ -87,19 +96,16 @@ public class SQLiteTemplates extends SQLTemplates {
     }
 
     @Override
-    public String asLiteral(Object o) {
-        if (o instanceof java.util.Date) {
-            return String.valueOf(((java.util.Date)o).getTime());
-        } else if (o instanceof ReadableInstant) {
-            return String.valueOf(((ReadableInstant) o).getMillis());
-        } else if (o instanceof LocalDate) {
-            return String.valueOf(((LocalDate) o).toDateTimeAtStartOfDay(DateTimeZone.UTC).getMillis());
-        } else if (o instanceof LocalDateTime) {
-            return String.valueOf(((LocalDateTime) o).toDateTime(DateTimeZone.UTC).getMillis());
-        } else if (o instanceof LocalTime) {
-            return String.valueOf(((LocalTime) o).getMillisOfDay());
+    public String serialize(String literal, int jdbcType) {
+        // XXX doesn't work with LocalDate, LocalDateTime and LocalTime
+        if (jdbcType == Types.TIMESTAMP) {
+            return String.valueOf(dateTimeFormatter.parseDateTime(literal).getMillis());
+        } else if (jdbcType == Types.DATE) {
+            return String.valueOf(dateFormatter.parseDateTime(literal).getMillis());
+        } else if (jdbcType == Types.TIME) {
+            return String.valueOf(timeFormatter.parseDateTime(literal).getMillis());
         } else {
-            return super.asLiteral(o);
+            return super.serialize(literal, jdbcType);
         }
     }
 
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java
index 4fb090deb..8e7e11fbc 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java
@@ -13,12 +13,6 @@
  */
 package com.mysema.query.sql.teradata;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.mysema.query.sql.Configuration;
@@ -26,6 +20,12 @@ import com.mysema.query.sql.SQLBindings;
 import com.mysema.query.sql.SQLTemplates;
 import com.mysema.query.sql.dml.AbstractSQLClause;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+
 /**
  * SetQueryBandClause provides support for Teradata specific set query_band executions.
  *
@@ -116,9 +116,9 @@ public class SetQueryBandClause extends AbstractSQLClause<SetQueryBandClause> {
                 builder.append(";");
             }
             if (configuration.getUseLiterals() || forSession) {
-                queryString = "set query_band="
-                        + configuration.getTemplates().asLiteral(builder.toString())
-                        + (forSession ? " for session" : " for transaction");
+                queryString = "set query_band='"
+                        + configuration.getTemplates().escapeLiteral(builder.toString())
+                        + (forSession ? "' for session" : "' for transaction");
                 parameter = null;
             } else {
                 queryString = "set query_band=?" + (forSession ? " for session" : " for transaction");
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java
new file mode 100644
index 000000000..7e0ec7e3c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014, Mysema Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mysema.query.sql.types;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.util.Calendar;
+import java.util.TimeZone;
+
+/**
+ * Common abstract superclass for Type implementations
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class AbstractDateTimeType<T>  extends AbstractType<T> {
+
+    private static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+
+    static {
+        UTC.setTimeInMillis(0);
+    }
+
+    protected static Calendar utc() {
+        return (Calendar) UTC.clone();
+    }
+
+    protected static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    protected static final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+
+    protected static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss");
+
+    public AbstractDateTimeType(int type) {
+        super(type);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java
index 46d0ca506..e248a472d 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java
@@ -13,9 +13,6 @@
  */
 package com.mysema.query.sql.types;
 
-import java.util.Calendar;
-import java.util.TimeZone;
-
 /**
  * Common abstract superclass for Type implementations
  *
@@ -25,16 +22,6 @@ import java.util.TimeZone;
  */
 public abstract class AbstractType<T> implements Type<T> {
 
-    private static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-
-    static {
-        UTC.setTimeInMillis(0);
-    }
-
-    protected static Calendar utc() {
-        return (Calendar) UTC.clone();
-    }
-
     private final int type;
 
     public AbstractType(int type) {
@@ -46,4 +33,8 @@ public abstract class AbstractType<T> implements Type<T> {
         return new int[]{type};
     }
 
+    public String getLiteral(T value) {
+        return value.toString();
+    }
+
 }
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java
index a726d5c15..3dd628942 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java
@@ -26,7 +26,7 @@ import java.util.Calendar;
  * @author tiwe
  *
  */
-public class CalendarType extends AbstractType<Calendar> {
+public class CalendarType extends AbstractDateTimeType<Calendar> {
 
     public CalendarType() {
         super(Types.TIMESTAMP);
@@ -36,6 +36,11 @@ public class CalendarType extends AbstractType<Calendar> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(Calendar value) {
+        return dateTimeFormatter.print(value.getTimeInMillis());
+    }
+
     @Override
     public Calendar getValue(ResultSet rs, int startIndex) throws SQLException {
         Timestamp ts = rs.getTimestamp(startIndex);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java
index fdb720971..3b004681e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java
@@ -13,21 +13,17 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-
 import org.joda.time.DateTime;
 
+import java.sql.*;
+
 /**
  * DateTimeType maps DateTime to Timestamp on the JDBC level
  *
  * @author tiwe
  *
  */
-public class DateTimeType extends AbstractType<DateTime> {
+public class DateTimeType extends AbstractDateTimeType<DateTime> {
 
     public DateTimeType() {
         super(Types.TIMESTAMP);
@@ -37,6 +33,11 @@ public class DateTimeType extends AbstractType<DateTime> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(DateTime value) {
+        return dateTimeFormatter.print(value);
+    }
+
     @Override
     public Class<DateTime> getReturnedClass() {
         return DateTime.class;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java
index 2d1fdadf2..e2dd345f7 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java
@@ -13,11 +13,7 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
+import java.sql.*;
 
 /**
  * DateType maps Date to Date on the JDBC level
@@ -25,7 +21,7 @@ import java.sql.Types;
  * @author tiwe
  *
  */
-public class DateType extends AbstractType<Date> {
+public class DateType extends AbstractDateTimeType<Date> {
 
     public DateType() {
         super(Types.DATE);
@@ -35,6 +31,11 @@ public class DateType extends AbstractType<Date> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(Date value) {
+        return dateFormatter.print(value.getTime());
+    }
+
     @Override
     public Date getValue(ResultSet rs, int startIndex) throws SQLException {
         return rs.getDate(startIndex);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java
index b8c67d788..89827c478 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java
@@ -13,23 +13,19 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
 
+import java.sql.*;
+
 /**
  * LocalDateTimeType maps LocalDateTime to Timestamp on the JDBC level
  *
  * @author tiwe
  *
  */
-public class LocalDateTimeType extends AbstractType<LocalDateTime> {
+public class LocalDateTimeType extends AbstractDateTimeType<LocalDateTime> {
 
     public LocalDateTimeType() {
         super(Types.TIMESTAMP);
@@ -39,6 +35,11 @@ public class LocalDateTimeType extends AbstractType<LocalDateTime> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(LocalDateTime value) {
+        return dateTimeFormatter.print(value);
+    }
+
     @Override
     public Class<LocalDateTime> getReturnedClass() {
         return LocalDateTime.class;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java
index f8247cd39..ff2a6e87d 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java
@@ -13,22 +13,18 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 
+import java.sql.*;
+
 /**
  * LocalDateType maps LocalDate to Date on the JDBC level
  *
  * @author tiwe
  *
  */
-public class LocalDateType extends AbstractType<LocalDate> {
+public class LocalDateType extends AbstractDateTimeType<LocalDate> {
 
     public LocalDateType() {
         super(Types.DATE);
@@ -38,6 +34,11 @@ public class LocalDateType extends AbstractType<LocalDate> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(LocalDate value) {
+        return dateFormatter.print(value);
+    }
+
     @Override
     public Class<LocalDate> getReturnedClass() {
         return LocalDate.class;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java
index 4eae179e8..ec7ea96ce 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java
@@ -13,22 +13,18 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Types;
-
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalTime;
 
+import java.sql.*;
+
 /**
  * LocalTimeType maps LocalTime to Time on the JDBC level
  *
  * @author tiwe
  *
  */
-public class LocalTimeType extends AbstractType<LocalTime> {
+public class LocalTimeType extends AbstractDateTimeType<LocalTime> {
 
     public LocalTimeType() {
         super(Types.TIME);
@@ -38,6 +34,11 @@ public class LocalTimeType extends AbstractType<LocalTime> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(LocalTime value) {
+        return timeFormatter.print(value);
+    }
+
     @Override
     public Class<LocalTime> getReturnedClass() {
         return LocalTime.class;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java
index 040096b53..cee289505 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java
@@ -13,11 +13,7 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Types;
+import java.sql.*;
 
 /**
  * TimeType maps Time to Time on the JDBC level
@@ -25,7 +21,7 @@ import java.sql.Types;
  * @author tiwe
  *
  */
-public class TimeType extends AbstractType<Time> {
+public class TimeType extends AbstractDateTimeType<Time> {
 
     public TimeType() {
         super(Types.TIME);
@@ -35,6 +31,11 @@ public class TimeType extends AbstractType<Time> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(Time value) {
+        return timeFormatter.print(value.getTime());
+    }
+
     @Override
     public Time getValue(ResultSet rs, int startIndex) throws SQLException {
         return rs.getTime(startIndex);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java
index 4d62d8de1..a03603ea0 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java
@@ -13,11 +13,7 @@
  */
 package com.mysema.query.sql.types;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
+import java.sql.*;
 
 /**
  * TimestampType maps Timestamp to Timestamp on the JDBC level
@@ -25,7 +21,7 @@ import java.sql.Types;
  * @author tiwe
  *
  */
-public class TimestampType extends AbstractType<Timestamp> {
+public class TimestampType extends AbstractDateTimeType<Timestamp> {
 
     public TimestampType() {
         super(Types.TIMESTAMP);
@@ -35,6 +31,11 @@ public class TimestampType extends AbstractType<Timestamp> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(Timestamp value) {
+        return dateTimeFormatter.print(value.getTime());
+    }
+
     @Override
     public Timestamp getValue(ResultSet rs, int startIndex) throws SQLException {
         return rs.getTimestamp(startIndex);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java
index bf6589dfa..23c44402e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java
@@ -13,12 +13,11 @@
  */
 package com.mysema.query.sql.types;
 
+import javax.annotation.Nullable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.annotation.Nullable;
-
 /**
  * Defines the de/serialization of a typed Java object from a ResultSet or to a PreparedStatement
  *
@@ -46,6 +45,14 @@ public interface Type<T> {
      */
     Class<T> getReturnedClass();
 
+    /**
+     * Get the literal representation
+     *
+     * @param value
+     * @return
+     */
+    String getLiteral(T value);
+
     /**
      * Get the object from the result set
      *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java
index 42efdad70..c91a56108 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java
@@ -25,7 +25,7 @@ import java.util.Date;
  * @author tiwe
  *
  */
-public class UtilDateType extends AbstractType<Date> {
+public class UtilDateType extends AbstractDateTimeType<Date> {
 
     public UtilDateType() {
         super(Types.TIMESTAMP);
@@ -35,6 +35,11 @@ public class UtilDateType extends AbstractType<Date> {
         super(type);
     }
 
+    @Override
+    public String getLiteral(Date value) {
+        return dateTimeFormatter.print(value.getTime());
+    }
+
     @Override
     public Date getValue(ResultSet rs, int startIndex) throws SQLException {
         return rs.getTimestamp(startIndex);
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java
index b2ef103e6..5d9ffc98d 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java
@@ -320,7 +320,7 @@ public class SelectBase extends AbstractBaseTest {
     }
 
     @Test
-    @IncludeIn({H2, SQLSERVER, MYSQL, ORACLE, SQLITE, TERADATA}) // TODO fix postgres
+    @IncludeIn({H2, SQLSERVER, MYSQL, ORACLE, TERADATA}) // TODO fix postgres
     public void Dates() {
         long ts = ((long)Math.floor(System.currentTimeMillis() / 1000)) * 1000;
         long tsDate = new org.joda.time.LocalDate(ts).toDateMidnight().getMillis();
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java
index 43950edf2..98e51a5b0 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java
@@ -13,27 +13,22 @@
  */
 package com.mysema.query.sql;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import com.mysema.query.support.Expressions;
+import com.mysema.query.types.*;
+import com.mysema.query.types.path.NumberPath;
+import com.mysema.query.types.template.SimpleTemplate;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
+import org.junit.Test;
 
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.regex.Pattern;
 
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.path.NumberPath;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.template.SimpleTemplate;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class SQLTemplatesTest {
 
@@ -58,17 +53,19 @@ public class SQLTemplatesTest {
     @Test
     public void AsLiteral() {
         SQLTemplates templates = SQLTemplates.DEFAULT;
-        assertMatches(DATE, templates.asLiteral(new Date(0)));
-        assertMatches(TIME, templates.asLiteral(new Time(0)));
-        assertMatches(DATETIME, templates.asLiteral(new Timestamp(0)));
+        Configuration conf = new Configuration(templates);
+        assertMatches(DATE, conf.asLiteral(new Date(0)));
+        assertMatches(TIME, conf.asLiteral(new Time(0)));
+        assertMatches(DATETIME, conf.asLiteral(new Timestamp(0)));
     }
 
     @Test
     public void AsLiteral_JodaTime() {
         SQLTemplates templates = SQLTemplates.DEFAULT;
-        assertMatches(DATE, templates.asLiteral(new LocalDate(0)));
-        assertMatches(TIME, templates.asLiteral(new LocalTime(0)));
-        assertMatches(DATETIME, templates.asLiteral(new DateTime(0)));
+        Configuration conf = new Configuration(templates);
+        assertMatches(DATE, conf.asLiteral(new LocalDate(0)));
+        assertMatches(TIME, conf.asLiteral(new LocalTime(0)));
+        assertMatches(DATETIME, conf.asLiteral(new DateTime(0)));
     }
 
     @Test

From ddf830260d57e72959540c74f7701e3f1844a793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 24 Apr 2014 22:49:29 +0300
Subject: [PATCH 08/20] Add bridge methods

---
 querydsl-sql/pom.xml                          | 63 +++++++++++++++++--
 .../query/sql/AbstractSQLQueryFactory.java    |  3 +
 .../mysema/query/sql/DetachableSQLQuery.java  | 38 ++++++++++-
 .../mysema/query/sql/ProjectableSQLQuery.java | 60 +++++++++++++-----
 querydsl-sql/template.mf                      |  1 +
 5 files changed, 142 insertions(+), 23 deletions(-)

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 60facda97..f39466255 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,6 +15,10 @@
   <description>SQL support for Querydsl</description>
   <packaging>jar</packaging>
 
+  <properties>
+    <bridge-method.version>1.11</bridge-method.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.mysema.querydsl</groupId>
@@ -134,12 +138,63 @@
       <artifactId>jdepend</artifactId>
       <version>2.9.1</version>
       <scope>test</scope>
-    </dependency>    
-    
+    </dependency>
+
+    <!-- backwards compatibility -->
+    <dependency>
+      <groupId>com.infradna.tool</groupId>
+      <artifactId>bridge-method-annotation</artifactId>
+      <version>${bridge-method.version}</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci</groupId>
+          <artifactId>annotation-indexer</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson</groupId>
+      <artifactId>annotation-indexer</artifactId>
+      <version>1.2</version>
+      <optional>true</optional>
+    </dependency>
+
   </dependencies>
   
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.infradna.tool</groupId>
+        <artifactId>bridge-method-injector</artifactId>
+        <version>${bridge-method.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>com.infradna.tool</groupId>
+            <artifactId>bridge-method-annotation</artifactId>
+            <version>${bridge-method.version}</version>
+            <optional>true</optional>
+            <exclusions>
+              <exclusion>
+                <groupId>org.jenkins-ci</groupId>
+                <artifactId>annotation-indexer</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.jvnet.hudson</groupId>
+            <artifactId>annotation-indexer</artifactId>
+            <version>1.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>
         <groupId>com.springsource.bundlor</groupId>
         <artifactId>com.springsource.bundlor.maven</artifactId>
@@ -211,4 +266,4 @@
     </plugins>
   </build>
   
-</project>
+</project>
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java
index e08a7e744..dd045ae17 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java
@@ -17,6 +17,7 @@ import java.sql.Connection;
 
 import javax.inject.Provider;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import com.mysema.query.sql.dml.SQLDeleteClause;
 import com.mysema.query.sql.dml.SQLInsertClause;
 import com.mysema.query.sql.dml.SQLMergeClause;
@@ -78,11 +79,13 @@ public abstract class AbstractSQLQueryFactory<Q extends SQLCommonQuery<Q>, SQ ex
 
     @SuppressWarnings("unchecked")
     @Override
+    @WithBridgeMethods(value=SQLSubQuery.class, castRequired=true)
     public SQ subQuery() {
         return (SQ) new SQLSubQuery();
     }
 
     @Override
+    @WithBridgeMethods(value=SQLSubQuery.class, castRequired=true)
     public final SQ subQuery(Expression<?> from) {
         return subQuery().from(from);
     }
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java
index 890abe2ed..5cdf8bc70 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.ImmutableList;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import com.mysema.query.DefaultQueryMetadata;
 import com.mysema.query.JoinFlag;
 import com.mysema.query.QueryFlag;
@@ -78,6 +79,7 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q addFlag(Position position, String prefix, Expression<?> expr) {
         Expression<?> flag = TemplateExpressionImpl.create(expr.getType(), prefix + "{0}", expr);
         return queryMixin.addFlag(new QueryFlag(position, flag));
@@ -91,6 +93,7 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q addFlag(Position position, String flag) {
         return queryMixin.addFlag(new QueryFlag(position, flag));
     }
@@ -103,6 +106,7 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q addFlag(Position position, Expression<?> flag) {
         return queryMixin.addFlag(new QueryFlag(position, flag));
     }
@@ -115,6 +119,7 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q addJoinFlag(String flag) {
         return addJoinFlag(flag, JoinFlag.Position.BEFORE_TARGET);
     }
@@ -127,6 +132,7 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     @SuppressWarnings("unchecked")
     public Q addJoinFlag(String flag, JoinFlag.Position position) {
         queryMixin.addJoinFlag(new JoinFlag(flag, position));
@@ -143,131 +149,154 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
         return exists().not();
     }
 
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q from(Expression<?> arg) {
         return queryMixin.from(arg);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q from(Expression<?>... args) {
         return queryMixin.from(args);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
         return queryMixin.from(ExpressionUtils.as((Expression)subQuery, alias));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q fullJoin(EntityPath<?> target) {
         return queryMixin.fullJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q fullJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.fullJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity) {
         return queryMixin.fullJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q fullJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.fullJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q innerJoin(EntityPath<?> target) {
         return queryMixin.innerJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q innerJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.innerJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q innerJoin(ForeignKey<E> key, RelationalPath<E> entity) {
         return queryMixin.innerJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q innerJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.innerJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q join(EntityPath<?> target) {
         return queryMixin.join(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q join(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.join(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q join(ForeignKey<E> key, RelationalPath<E>  entity) {
         return queryMixin.join(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q join(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.join(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q leftJoin(EntityPath<?> target) {
         return queryMixin.leftJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q leftJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.leftJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q leftJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
         return queryMixin.leftJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q leftJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.leftJoin(target, alias);
     }
 
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q on(Predicate condition) {
         return queryMixin.on(condition);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q on(Predicate... conditions) {
         return queryMixin.on(conditions);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q rightJoin(EntityPath<?> target) {
         return queryMixin.rightJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q rightJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.fullJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public <E> Q rightJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
         return queryMixin.rightJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q rightJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.rightJoin(target, alias);
     }
-    
-
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private <T> CollectionExpressionBase<?,T> union(Operator<Object> op, List<? extends SubQueryExpression<?>> sq) {
@@ -311,30 +340,35 @@ public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extend
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q withRecursive(Path<?> alias, SubQueryExpression<?> query) {
         queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
         return with(alias, query);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q withRecursive(Path<?> alias, Expression<?> query) {
         queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
         return with(alias, query);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public WithBuilder<Q> withRecursive(Path<?> alias, Path<?>... columns) {
         queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
         return with(alias, columns);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q with(Path<?> alias, SubQueryExpression<?> target) {
         Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, target);
         return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
     public Q with(Path<?> alias, Expression<?> query) {
         Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
         return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java
index 8dfe76328..e3365475f 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java
@@ -13,32 +13,19 @@
  */
 package com.mysema.query.sql;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableList;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.Query;
-import com.mysema.query.QueryFlag;
+import com.mysema.query.*;
 import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
 import com.mysema.query.support.Expressions;
 import com.mysema.query.support.ProjectableQuery;
 import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.SubQueryExpression;
+import com.mysema.query.types.*;
 import com.mysema.query.types.expr.Wildcard;
 import com.mysema.query.types.query.ListSubQuery;
 import com.mysema.query.types.template.NumberTemplate;
@@ -73,6 +60,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q addJoinFlag(String flag) {
         return addJoinFlag(flag, JoinFlag.Position.BEFORE_TARGET);
     }
@@ -85,6 +73,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     @SuppressWarnings("unchecked")
     public Q addJoinFlag(String flag, JoinFlag.Position position) {
         queryMixin.addJoinFlag(new JoinFlag(flag, position));
@@ -100,6 +89,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q addFlag(Position position, String prefix, Expression<?> expr) {
         Expression<?> flag = SimpleTemplate.create(expr.getType(), prefix + "{0}", expr);
         return queryMixin.addFlag(new QueryFlag(position, flag));
@@ -111,6 +101,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @param flag
      * @return
      */
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q addFlag(QueryFlag flag) {
         return queryMixin.addFlag(flag);
     }
@@ -123,6 +114,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q addFlag(Position position, String flag) {
         return queryMixin.addFlag(new QueryFlag(position, flag));
     }
@@ -135,6 +127,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @return
      */
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q addFlag(Position position, Expression<?> flag) {
         return queryMixin.addFlag(new QueryFlag(position, flag));
     }
@@ -150,117 +143,140 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
         return limit(1).singleResult(NumberTemplate.ONE) != null;
     }
 
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q from(Expression<?> arg) {
         return queryMixin.from(arg);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q from(Expression<?>... args) {
         return queryMixin.from(args);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
         return queryMixin.from(ExpressionUtils.as((Expression) subQuery, alias));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q fullJoin(EntityPath<?> target) {
         return queryMixin.fullJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q fullJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.fullJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q fullJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.fullJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity) {
         return queryMixin.fullJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q innerJoin(EntityPath<?> target) {
         return queryMixin.innerJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q innerJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.innerJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q innerJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.innerJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q innerJoin(ForeignKey<E> key, RelationalPath<E> entity) {
         return queryMixin.innerJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q join(EntityPath<?> target) {
         return queryMixin.join(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q join(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.join(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q join(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.join(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q join(ForeignKey<E> key, RelationalPath<E>  entity) {
         return queryMixin.join(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q leftJoin(EntityPath<?> target) {
         return queryMixin.leftJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q leftJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.leftJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q leftJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.leftJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q leftJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
         return queryMixin.leftJoin(entity).on(key.on(entity));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q rightJoin(EntityPath<?> target) {
         return queryMixin.rightJoin(target);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q rightJoin(RelationalFunctionCall<E> target, Path<E> alias) {
         return queryMixin.rightJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q rightJoin(SubQueryExpression<?> target, Path<?> alias) {
         return queryMixin.rightJoin(target, alias);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <E> Q rightJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
         return queryMixin.rightJoin(entity).on(key.on(entity));
     }
@@ -294,11 +310,13 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
         return listResults(queryMixin.createProjection(args));
     }
 
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q on(Predicate condition) {
         return queryMixin.on(condition);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q on(Predicate... conditions) {
         return queryMixin.on(conditions);
     }
@@ -321,6 +339,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @param sq
      * @return
      */
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <RT> Q union(Path<?> alias, ListSubQuery<RT>... sq) {
         return from(UnionUtils.union(sq, alias, false));
     }
@@ -343,6 +362,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @param sq
      * @return
      */
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <RT> Q union(Path<?> alias, SubQueryExpression<RT>... sq) {
         return from(UnionUtils.union(sq, alias, false));
     }
@@ -366,6 +386,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @param sq
      * @return
      */
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <RT> Q unionAll(Path<?> alias, ListSubQuery<RT>... sq) {
         return from(UnionUtils.union(sq, alias, true));
     }
@@ -389,6 +410,7 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
      * @param sq
      * @return
      */
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public <RT> Q unionAll(Path<?> alias, SubQueryExpression<RT>... sq) {
         return from(UnionUtils.union(sq, alias, true));
     }
@@ -409,12 +431,14 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q withRecursive(Path<?> alias, SubQueryExpression<?> query) {
         queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
         return with(alias, query);
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q withRecursive(Path<?> alias, Expression<?> query) {
         queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
         return with(alias, query);
@@ -427,12 +451,14 @@ public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Que
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q with(Path<?> alias, SubQueryExpression<?> query) {
         Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
         return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
     }
 
     @Override
+    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
     public Q with(Path<?> alias, Expression<?> query) {
         Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
         return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
diff --git a/querydsl-sql/template.mf b/querydsl-sql/template.mf
index 70ceffcde..be7f130c6 100644
--- a/querydsl-sql/template.mf
+++ b/querydsl-sql/template.mf
@@ -2,6 +2,7 @@ Bundle-SymbolicName: com.mysema.querydsl.sql
 Bundle-Name: Querydsl SQL
 Bundle-Vendor: Mysema
 Bundle-ManifestVersion: 2
+Excluded-Imports: com.infradna.tool.bridge_method_injector
 Import-Template:
   com.mysema.commons.lang.*;version="${mysema.lang.version}",
   com.mysema.query.*;version="${project.version}",   

From 867989aafb156c3c3a8d95bc9375e2c1373f2a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 24 Apr 2014 22:50:55 +0300
Subject: [PATCH 09/20] Add enforcer config back

---
 querydsl-root/pom.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 3e3f220d3..5155eb679 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -183,6 +183,35 @@
     </pluginManagement>
     
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.3.1</version>
+        <executions>
+          <execution>
+            <id>check</id>
+            <phase>verify</phase> 
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
+                  <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
+                  <dumpDetails>true</dumpDetails>
+                </requireBackwardCompatibility>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.semver</groupId>
+            <artifactId>enforcer-rule</artifactId>
+            <version>0.9.23</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>       
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>

From b66848e10a7e1ec2b8206e335d76a08418641029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Fri, 25 Apr 2014 11:24:45 +0300
Subject: [PATCH 10/20] Simplify signature

---
 .../query/jdo/sql/AbstractSQLQuery.java       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
index 2067b92cf..f220ce32a 100644
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
@@ -13,6 +13,16 @@
  */
 package com.mysema.query.jdo.sql;
 
+import javax.annotation.Nullable;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 import com.google.common.collect.Lists;
 import com.mysema.commons.lang.CloseableIterator;
 import com.mysema.commons.lang.IteratorAdapter;
@@ -26,16 +36,6 @@ import com.mysema.query.types.FactoryExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Query;
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Base class for JDO based SQLQuery implementations
  *
@@ -44,7 +44,7 @@ import java.util.List;
  * @param <T>
  */
 @SuppressWarnings("rawtypes")
-public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T> & com.mysema.query.Query<T>> extends ProjectableSQLQuery<T> {
+public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T>> extends ProjectableSQLQuery<T> {
 
 
     private static final Logger logger = LoggerFactory.getLogger(JDOSQLQuery.class);

From 44fc34735be84a99b35d7f1a028d7d504bd827b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 30 Apr 2014 17:38:56 +0300
Subject: [PATCH 11/20] Run only on jdk7 for the moment

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b88e9ce91..1a6f5120a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - oraclejdk8
   - oraclejdk7
 services:
   - mongodb

From 92007d1d7d867ccf1d34c6ea938e1c078c58df53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 30 Apr 2014 17:40:07 +0300
Subject: [PATCH 12/20] Run only on jdk7 for the moment

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b88e9ce91..1a6f5120a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - oraclejdk8
   - oraclejdk7
 services:
   - mongodb

From 261d3c1c1e9dcb334727f6cfae0c77b1a3b1f0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 30 Apr 2014 20:34:41 +0300
Subject: [PATCH 13/20] Comment enforcer plugin out

---
 querydsl-root/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 4b818edfc..6670fa07d 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -183,6 +183,7 @@
     </pluginManagement>
     
     <plugins>
+<!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -212,6 +213,7 @@
           </dependency>
         </dependencies>
       </plugin>
+-->
       <plugin>       
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>

From f8eea76efb039dffade11f2319101fd1e58ec2dc Mon Sep 17 00:00:00 2001
From: Ruben Dijkstra <ruben.dijkstra@hva.nl>
Date: Thu, 1 May 2014 22:42:33 +0200
Subject: [PATCH 14/20] Log a more user friendly version of the elapsed time
 for benchmarks.

---
 .../test/java/com/mysema/testutil/Runner.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/querydsl-core/src/test/java/com/mysema/testutil/Runner.java b/querydsl-core/src/test/java/com/mysema/testutil/Runner.java
index 1054cebdb..fb0b05fbd 100644
--- a/querydsl-core/src/test/java/com/mysema/testutil/Runner.java
+++ b/querydsl-core/src/test/java/com/mysema/testutil/Runner.java
@@ -13,24 +13,28 @@
  */
 package com.mysema.testutil;
 
+import com.google.common.base.Stopwatch;
+
 public final class Runner {
-    
+
+    private static final int WARMUP = 50000;
+    private static final int BENCHMARK = 1000000;
+
     public static void run(String label, Benchmark benchmark) throws Exception {
         // warmup
-        benchmark.run(50000);
+        benchmark.run(WARMUP);
         System.err.print("- ");
 
         // run garbage collection
         System.gc();
         System.err.print("- ");
-        
+
         // perform timing
-        long start = System.nanoTime();
-        benchmark.run(1000000);
-        long end = System.nanoTime();
-        System.err.println(label + " " + ((end-start) / 1000000));
+        Stopwatch stopwatch = new Stopwatch().start();
+        benchmark.run(BENCHMARK);
+        System.err.println(label + " " + stopwatch.stop().toString());
     }
-    
+
     private Runner() {}
 
 }

From 2f03757c8065bf3197ad3740cadff9c664ae50d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Fri, 2 May 2014 21:49:14 +0300
Subject: [PATCH 15/20] Simplify signature

---
 .../jpa/hibernate/sql/AbstractHibernateSQLQuery.java   | 10 +++++-----
 .../query/jpa/hibernate/sql/HibernateSQLQuery.java     |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
index 575a149f4..847b5cf86 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
@@ -13,6 +13,10 @@
  */
 package com.mysema.query.jpa.hibernate.sql;
 
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+
 import com.mysema.commons.lang.CloseableIterator;
 import com.mysema.query.*;
 import com.mysema.query.NonUniqueResultException;
@@ -33,10 +37,6 @@ import org.hibernate.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
 /**
  * AbstractHibernateSQLQuery is the base class for Hibernate Native SQL queries
  *
@@ -44,7 +44,7 @@ import java.util.Map;
  *
  * @param <Q>
  */
-public abstract class AbstractHibernateSQLQuery<Q extends AbstractHibernateSQLQuery<Q> & com.mysema.query.Query<Q>> extends AbstractSQLQuery<Q> {
+public abstract class AbstractHibernateSQLQuery<Q extends AbstractHibernateSQLQuery<Q>> extends AbstractSQLQuery<Q> {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractHibernateSQLQuery.class);
 
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
index a71eb2909..697406976 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
@@ -13,14 +13,12 @@
  */
 package com.mysema.query.jpa.hibernate.sql;
 
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.jpa.hibernate.SessionHolder;
 import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLCommonQuery;
 import com.mysema.query.sql.SQLTemplates;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
 
 /**
  * HibernateSQLQuery is an SQLQuery implementation that uses Hibernate's Native SQL functionality
@@ -29,7 +27,7 @@ import com.mysema.query.sql.SQLTemplates;
  * @author tiwe
  *
  */
-public final class HibernateSQLQuery extends AbstractHibernateSQLQuery<HibernateSQLQuery> implements SQLCommonQuery<HibernateSQLQuery> {
+public final class HibernateSQLQuery extends AbstractHibernateSQLQuery<HibernateSQLQuery> {
 
     public HibernateSQLQuery(Session session, SQLTemplates sqlTemplates) {
         super(session, new Configuration(sqlTemplates));

From 0b72e42151b7d5e7784b8bbdc68ee0973b30fd1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Fri, 2 May 2014 22:14:27 +0300
Subject: [PATCH 16/20] Bump version

---
 querydsl-apt/pom.xml                          |    6 +-
 querydsl-codegen/pom.xml                      |    2 +-
 querydsl-collections/pom.xml                  |    2 +-
 querydsl-core/pom.xml                         |    2 +-
 .../main/docbook/en-US/Querydsl_Reference.xml |    2 +-
 querydsl-hibernate-search/pom.xml             |    2 +-
 querydsl-jdo/pom.xml                          |    6 +-
 querydsl-jpa-codegen/pom.xml                  |    2 +-
 querydsl-jpa/pom.xml                          |    6 +-
 querydsl-lucene3/pom.xml                      |    2 +-
 querydsl-lucene4/pom.xml                      |    2 +-
 querydsl-maven-plugin/pom.xml                 |    2 +-
 querydsl-mongodb/pom.xml                      |    6 +-
 querydsl-root/pom.xml                         | 1028 ++++++++---------
 querydsl-scala/pom.xml                        |    2 +-
 querydsl-sql-codegen/pom.xml                  |    2 +-
 querydsl-sql/pom.xml                          |    6 +-
 17 files changed, 540 insertions(+), 540 deletions(-)

diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index 5b3b555cc..1b2100748 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
@@ -225,4 +225,4 @@
     </repository>
   </repositories>
   
-</project>
+</project>
diff --git a/querydsl-codegen/pom.xml b/querydsl-codegen/pom.xml
index 6da6fb496..00dd431bc 100644
--- a/querydsl-codegen/pom.xml
+++ b/querydsl-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index f752ca1b4..54517b9f9 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath>
   </parent>
 
diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
index 5dcc15370..fe1f76108 100644
--- a/querydsl-core/pom.xml
+++ b/querydsl-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml b/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
index 0ba79e343..955ddcd8b 100644
--- a/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
+++ b/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "3.3.2">
+        <!ENTITY versionNumber "3.3.3">
         <!ENTITY copyrightYear "2007-2014">
         <!ENTITY copyrightHolder "Mysema Ltd.">
 ]>
diff --git a/querydsl-hibernate-search/pom.xml b/querydsl-hibernate-search/pom.xml
index a43f84b62..727b240b8 100644
--- a/querydsl-hibernate-search/pom.xml
+++ b/querydsl-hibernate-search/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml
index 22ad57fb9..eaa9d04a1 100644
--- a/querydsl-jdo/pom.xml
+++ b/querydsl-jdo/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
@@ -282,4 +282,4 @@
     </pluginRepository>
   </pluginRepositories>
 
-</project>
+</project>
diff --git a/querydsl-jpa-codegen/pom.xml b/querydsl-jpa-codegen/pom.xml
index b2f744c36..1696b5b9e 100644
--- a/querydsl-jpa-codegen/pom.xml
+++ b/querydsl-jpa-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index ff64ea009..2c4e96fc5 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
@@ -350,4 +350,4 @@
     </profile>
   </profiles>
 
-</project>
+</project>
diff --git a/querydsl-lucene3/pom.xml b/querydsl-lucene3/pom.xml
index d02d67736..62cf8f1d4 100644
--- a/querydsl-lucene3/pom.xml
+++ b/querydsl-lucene3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-lucene4/pom.xml b/querydsl-lucene4/pom.xml
index a932e8b17..8ceea9a35 100644
--- a/querydsl-lucene4/pom.xml
+++ b/querydsl-lucene4/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-maven-plugin/pom.xml b/querydsl-maven-plugin/pom.xml
index bf3d3be61..c16a29454 100644
--- a/querydsl-maven-plugin/pom.xml
+++ b/querydsl-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-mongodb/pom.xml b/querydsl-mongodb/pom.xml
index 837f66691..c40bfaf30 100644
--- a/querydsl-mongodb/pom.xml
+++ b/querydsl-mongodb/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath>
   </parent>
 
@@ -148,4 +148,4 @@
   </build>
 
 
-</project>
+</project>
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 6670fa07d..f25496595 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -1,516 +1,516 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-root</artifactId>
-  <version>3.3.3.BUILD-SNAPSHOT</version>
-  <name>Querydsl</name>
-  <description>parent project for Querydsl modules</description>
-  <url>http://www.querydsl.com</url>
-  
-  <parent>
-    <groupId>com.mysema.home</groupId>
-    <artifactId>mysema-source</artifactId>
-    <version>0.3.1</version>
-  </parent>
-  
-  <packaging>pom</packaging>
-
-  <inceptionYear>2007</inceptionYear>
-  
-  <properties>    
-    <failIfNoTests>false</failIfNoTests>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    
-    <!-- deps -->
-    <derby.version>10.10.1.1</derby.version>
-    <hsqldb.version>2.3.1</hsqldb.version>
-    <h2.version>1.3.174</h2.version>
-    <postgresql.version>9.1-901.jdbc4</postgresql.version>
-    <oracle.version>11.1.0.7.0</oracle.version>
-    <mysql.version>5.1.18</mysql.version>
-    <jtds.version>1.3.1</jtds.version>
-    <cubrid.version>8.4.0</cubrid.version>
-    <sqlite.version>3.7.2</sqlite.version>
-    <teradata.version>13.10.00.35</teradata.version>
-    
-    <guava.version>13.0.1</guava.version>
-    <codegen.version>0.6.2</codegen.version>
-    <mysema.lang.version>0.2.4</mysema.lang.version>
-    <cglib.version>2.2.2</cglib.version>    
-    <findbugs.version>1.3.2</findbugs.version>
-    <slf4j.version>1.6.1</slf4j.version>
-  </properties>
-     
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib-nodep</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>
-        <scope>provided</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <organization>
-    <name>Mysema Ltd</name>
-    <url>http://www.mysema.com</url>
-  </organization>
-  
-  <scm>                  
-    <connection>scm:git:git@github.com:mysema/querydsl.git</connection>
-    <developerConnection>scm:git:git@github.com:mysema/querydsl.git</developerConnection>
-    <url>git@github.com:mysema/querydsl.git</url>
-  </scm>
-  
-  <developers>
-    <developer>
-      <id>tiwe</id>
-      <name>Timo Westkämper</name>
-      <email>timo.westkamper@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Project Manager</role>
-        <role>Architect</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sasa</id>
-      <name>Samppa Saarela</name>
-      <email>samppa.saarela@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>vema</id>
-      <name>Vesa Marttila</name>
-      <email>vesa.marttila@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>laim</id>
-      <name>Lassi Immonen</name>
-      <email>lassi.immonen@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>    
-  </developers>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>LICENSE.txt</url>
-    </license>
-  </licenses>
-  
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>com.mysema.maven</groupId>
-          <artifactId>apt-maven-plugin</artifactId>
-          <version>1.0.9</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.16</version>
-        </plugin>
-        <plugin>
-          <groupId>com.springsource.bundlor</groupId>
-          <artifactId>com.springsource.bundlor.maven</artifactId>
-          <version>1.0.0.RELEASE</version>
-          <executions>
-            <execution>
-              <id>bundlor</id>
-              <goals>
-                <goal>bundlor</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <failOnWarnings>true</failOnWarnings> 
-          </configuration>
-        </plugin>
-      </plugins>      
-    </pluginManagement>
-    
-    <plugins>
-<!--
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
-        <executions>
-          <execution>
-            <id>check</id>
-            <phase>verify</phase> 
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
-                  <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
-                  <dumpDetails>true</dumpDetails>
-                </requireBackwardCompatibility>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.semver</groupId>
-            <artifactId>enforcer-rule</artifactId>
-            <version>0.9.23</version>
-          </dependency>
-        </dependencies>
-      </plugin>
--->
-      <plugin>       
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>../querydsl-root/src/main/assembly.xml</descriptor>
-          </descriptors>
-          <outputDirectory>../querydsl-root/target/dist</outputDirectory>
-        </configuration>
-      </plugin>     
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
-          <outputDirectory>${project.build.directory}/dist/apidocs</outputDirectory>
-          <reportOutputDirectory>${project.build.directory}/dist/apidocs</reportOutputDirectory>
-          <groups>
-            <group>
-              <title>Core</title>
-              <packages>com.mysema.query:com.mysema.query.alias:com.mysema.query.annotations:com.mysema.query.codegen:com.mysema.query.dml:com.mysema.query.functions:com.mysema.query.serialization:com.mysema.query.support:com.mysema.query.types*</packages>
-            </group>
-            <group>
-              <title>APT</title>
-              <packages>com.mysema.query.apt*</packages>
-            </group>
-            <group>
-              <title>Collections</title>
-              <packages>com.mysema.query.collections*</packages>
-            </group>
-            <group>
-              <title>JPA</title>
-              <packages>com.mysema.query.jpa*</packages>
-            </group>
-            <group>
-              <title>JDO</title>
-              <packages>com.mysema.query.jdo*</packages>
-            </group>
-            <group>
-              <title>SQL</title>
-              <packages>com.mysema.query.sql*</packages>
-            </group>
-            <group>
-              <title>Lucene</title>
-              <packages>com.mysema.query.lucene</packages>
-            </group>
-            <group>
-              <title>Hibernate Search</title>
-              <packages>com.mysema.query.search</packages>
-            </group>
-            <group>
-              <title>Mongodb</title>
-              <packages>com.mysema.query.mongodb*</packages>        
-            </group>            
-          </groups>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.mysema.maven</groupId>
-        <artifactId>maven-version-plugin</artifactId>
-        <version>0.1.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <targetJdk>1.6</targetJdk>   
-          <includeTests>true</includeTests>     
-        </configuration>
-      </plugin>      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>            
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>  
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <useDefaultManifestFile>true</useDefaultManifestFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
-          <excludedGroups>com.mysema.testutil.ExternalDB</excludedGroups>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>2.16</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
-  <repositories>
-    <repository>
-      <id>jahia</id>
-      <url>http://maven.jahia.org/maven2</url>
-    </repository>
-    <repository>
-      <id>com.springsource.repository.bundles.release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>com.springsource.repository.bundles.release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>com.springsource.repository.bundles.external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </pluginRepository>
-  </pluginRepositories>
- 
-  <profiles>
-    <profile>
-      <id>all</id>
-      <activation><activeByDefault>true</activeByDefault></activation>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-collections</module>           
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>        
-        <module>../querydsl-maven-plugin</module>
-        <module>../querydsl-jpa</module>    
-        <module>../querydsl-jpa-codegen</module>
-        <module>../querydsl-jdo</module>
-                
-        <!-- Lucene related -->
-        <module>../querydsl-lucene3</module>
-        <module>../querydsl-lucene4</module>
-        <module>../querydsl-hibernate-search</module>
-        
-        <!-- NoSQL -->
-        <module>../querydsl-mongodb</module>
-        
-        <!-- Languages -->        
-        <module>../querydsl-scala</module>
-      </modules>
-    </profile>
-    
-    <profile>
-      <id>hibernate-search</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-lucene3</module>  
-        <module>../querydsl-hibernate-search</module>        
-      </modules>
-    </profile>   
-
-    <profile>
-      <id>jpa</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>
-        <module>../querydsl-maven-plugin</module>        
-        <module>../querydsl-jpa</module>        
-        <module>../querydsl-jpa-codegen</module>
-      </modules>
-    </profile>    
-    
-    <profile>
-      <id>jdo</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>
-        <module>../querydsl-maven-plugin</module>        
-        <module>../querydsl-jdo</module>
-      </modules>
-    </profile>        
-    
-    <profile>
-      <id>lucene</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-lucene3</module>         
-        <module>../querydsl-lucene4</module>
-      </modules>
-    </profile>     
-    
-    <profile>
-      <id>mongodb</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-mongodb</module>        
-      </modules>
-    </profile>
-    
-    <profile>
-      <id>sql</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>
-        <module>../querydsl-maven-plugin</module>        
-      </modules>
-    </profile>        
-  
-    <profile>
-      <id>collections</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module>
-        <module>../querydsl-collections</module>
-      </modules>
-    </profile>
-    
-    <profile>
-      <id>jenkins</id>      
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>          
-              <excludedGroups>com.mysema.testutil.DummyInterface</excludedGroups>
-              <excludes>
-                <exclude>**/*$*</exclude>
-                <exclude>**/MSSQLSuiteTest.java</exclude>
-                <exclude>**/TeradataSuiteTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  
-  </profiles>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
-          <detectJavaApiLink>true</detectJavaApiLink>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>junit-report-maven-plugin</artifactId>
-        <version>devel</version>
-        <configuration>
-          <testFailureIgnore>true</testFailureIgnore>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.mysema.querydsl</groupId>
+  <artifactId>querydsl-root</artifactId>
+  <version>3.3.3</version>
+  <name>Querydsl</name>
+  <description>parent project for Querydsl modules</description>
+  <url>http://www.querydsl.com</url>
+  
+  <parent>
+    <groupId>com.mysema.home</groupId>
+    <artifactId>mysema-source</artifactId>
+    <version>0.3.1</version>
+  </parent>
+  
+  <packaging>pom</packaging>
+
+  <inceptionYear>2007</inceptionYear>
+  
+  <properties>    
+    <failIfNoTests>false</failIfNoTests>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    
+    <!-- deps -->
+    <derby.version>10.10.1.1</derby.version>
+    <hsqldb.version>2.3.1</hsqldb.version>
+    <h2.version>1.3.174</h2.version>
+    <postgresql.version>9.1-901.jdbc4</postgresql.version>
+    <oracle.version>11.1.0.7.0</oracle.version>
+    <mysql.version>5.1.18</mysql.version>
+    <jtds.version>1.3.1</jtds.version>
+    <cubrid.version>8.4.0</cubrid.version>
+    <sqlite.version>3.7.2</sqlite.version>
+    <teradata.version>13.10.00.35</teradata.version>
+    
+    <guava.version>13.0.1</guava.version>
+    <codegen.version>0.6.2</codegen.version>
+    <mysema.lang.version>0.2.4</mysema.lang.version>
+    <cglib.version>2.2.2</cglib.version>    
+    <findbugs.version>1.3.2</findbugs.version>
+    <slf4j.version>1.6.1</slf4j.version>
+  </properties>
+     
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>3.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib-nodep</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+        <scope>provided</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <organization>
+    <name>Mysema Ltd</name>
+    <url>http://www.mysema.com</url>
+  </organization>
+  
+  <scm>                  
+    <connection>scm:git:git@github.com:mysema/querydsl.git</connection>
+    <developerConnection>scm:git:git@github.com:mysema/querydsl.git</developerConnection>
+    <url>git@github.com:mysema/querydsl.git</url>
+  </scm>
+  
+  <developers>
+    <developer>
+      <id>tiwe</id>
+      <name>Timo Westkämper</name>
+      <email>timo.westkamper@mysema.com</email>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Project Manager</role>
+        <role>Architect</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sasa</id>
+      <name>Samppa Saarela</name>
+      <email>samppa.saarela@mysema.com</email>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>vema</id>
+      <name>Vesa Marttila</name>
+      <email>vesa.marttila@mysema.com</email>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>laim</id>
+      <name>Lassi Immonen</name>
+      <email>lassi.immonen@mysema.com</email>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>    
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>LICENSE.txt</url>
+    </license>
+  </licenses>
+  
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>com.mysema.maven</groupId>
+          <artifactId>apt-maven-plugin</artifactId>
+          <version>1.0.9</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.16</version>
+        </plugin>
+        <plugin>
+          <groupId>com.springsource.bundlor</groupId>
+          <artifactId>com.springsource.bundlor.maven</artifactId>
+          <version>1.0.0.RELEASE</version>
+          <executions>
+            <execution>
+              <id>bundlor</id>
+              <goals>
+                <goal>bundlor</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <failOnWarnings>true</failOnWarnings> 
+          </configuration>
+        </plugin>
+      </plugins>      
+    </pluginManagement>
+    
+    <plugins>
+<!--
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.3.1</version>
+        <executions>
+          <execution>
+            <id>check</id>
+            <phase>verify</phase> 
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
+                  <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
+                  <dumpDetails>true</dumpDetails>
+                </requireBackwardCompatibility>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.semver</groupId>
+            <artifactId>enforcer-rule</artifactId>
+            <version>0.9.23</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+-->
+      <plugin>       
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>../querydsl-root/src/main/assembly.xml</descriptor>
+          </descriptors>
+          <outputDirectory>../querydsl-root/target/dist</outputDirectory>
+        </configuration>
+      </plugin>     
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <configuration>
+          <outputDirectory>${project.build.directory}/dist/apidocs</outputDirectory>
+          <reportOutputDirectory>${project.build.directory}/dist/apidocs</reportOutputDirectory>
+          <groups>
+            <group>
+              <title>Core</title>
+              <packages>com.mysema.query:com.mysema.query.alias:com.mysema.query.annotations:com.mysema.query.codegen:com.mysema.query.dml:com.mysema.query.functions:com.mysema.query.serialization:com.mysema.query.support:com.mysema.query.types*</packages>
+            </group>
+            <group>
+              <title>APT</title>
+              <packages>com.mysema.query.apt*</packages>
+            </group>
+            <group>
+              <title>Collections</title>
+              <packages>com.mysema.query.collections*</packages>
+            </group>
+            <group>
+              <title>JPA</title>
+              <packages>com.mysema.query.jpa*</packages>
+            </group>
+            <group>
+              <title>JDO</title>
+              <packages>com.mysema.query.jdo*</packages>
+            </group>
+            <group>
+              <title>SQL</title>
+              <packages>com.mysema.query.sql*</packages>
+            </group>
+            <group>
+              <title>Lucene</title>
+              <packages>com.mysema.query.lucene</packages>
+            </group>
+            <group>
+              <title>Hibernate Search</title>
+              <packages>com.mysema.query.search</packages>
+            </group>
+            <group>
+              <title>Mongodb</title>
+              <packages>com.mysema.query.mongodb*</packages>        
+            </group>            
+          </groups>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>maven-version-plugin</artifactId>
+        <version>0.1.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <targetJdk>1.6</targetJdk>   
+          <includeTests>true</includeTests>     
+        </configuration>
+      </plugin>      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>            
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>  
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <useDefaultManifestFile>true</useDefaultManifestFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
+          <excludedGroups>com.mysema.testutil.ExternalDB</excludedGroups>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>2.16</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>jahia</id>
+      <url>http://maven.jahia.org/maven2</url>
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.release</id>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>com.springsource.repository.bundles.release</id>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>com.springsource.repository.bundles.external</id>
+      <url>http://repository.springsource.com/maven/bundles/external</url>
+    </pluginRepository>
+  </pluginRepositories>
+ 
+  <profiles>
+    <profile>
+      <id>all</id>
+      <activation><activeByDefault>true</activeByDefault></activation>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-apt</module> 
+        <module>../querydsl-collections</module>           
+        <module>../querydsl-sql</module>
+        <module>../querydsl-sql-codegen</module>        
+        <module>../querydsl-maven-plugin</module>
+        <module>../querydsl-jpa</module>    
+        <module>../querydsl-jpa-codegen</module>
+        <module>../querydsl-jdo</module>
+                
+        <!-- Lucene related -->
+        <module>../querydsl-lucene3</module>
+        <module>../querydsl-lucene4</module>
+        <module>../querydsl-hibernate-search</module>
+        
+        <!-- NoSQL -->
+        <module>../querydsl-mongodb</module>
+        
+        <!-- Languages -->        
+        <module>../querydsl-scala</module>
+      </modules>
+    </profile>
+    
+    <profile>
+      <id>hibernate-search</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-lucene3</module>  
+        <module>../querydsl-hibernate-search</module>        
+      </modules>
+    </profile>   
+
+    <profile>
+      <id>jpa</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-apt</module> 
+        <module>../querydsl-sql</module>
+        <module>../querydsl-sql-codegen</module>
+        <module>../querydsl-maven-plugin</module>        
+        <module>../querydsl-jpa</module>        
+        <module>../querydsl-jpa-codegen</module>
+      </modules>
+    </profile>    
+    
+    <profile>
+      <id>jdo</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-apt</module> 
+        <module>../querydsl-sql</module>
+        <module>../querydsl-sql-codegen</module>
+        <module>../querydsl-maven-plugin</module>        
+        <module>../querydsl-jdo</module>
+      </modules>
+    </profile>        
+    
+    <profile>
+      <id>lucene</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-apt</module> 
+        <module>../querydsl-lucene3</module>         
+        <module>../querydsl-lucene4</module>
+      </modules>
+    </profile>     
+    
+    <profile>
+      <id>mongodb</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-apt</module> 
+        <module>../querydsl-mongodb</module>        
+      </modules>
+    </profile>
+    
+    <profile>
+      <id>sql</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-sql</module>
+        <module>../querydsl-sql-codegen</module>
+        <module>../querydsl-maven-plugin</module>        
+      </modules>
+    </profile>        
+  
+    <profile>
+      <id>collections</id>
+      <modules>
+        <module>../querydsl-core</module>
+        <module>../querydsl-codegen</module>
+        <module>../querydsl-apt</module>
+        <module>../querydsl-collections</module>
+      </modules>
+    </profile>
+    
+    <profile>
+      <id>jenkins</id>      
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>          
+              <excludedGroups>com.mysema.testutil.DummyInterface</excludedGroups>
+              <excludes>
+                <exclude>**/*$*</exclude>
+                <exclude>**/MSSQLSuiteTest.java</exclude>
+                <exclude>**/TeradataSuiteTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  
+  </profiles>
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <configuration>
+          <detectJavaApiLink>true</detectJavaApiLink>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>junit-report-maven-plugin</artifactId>
+        <version>devel</version>
+        <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+  
 </project>
diff --git a/querydsl-scala/pom.xml b/querydsl-scala/pom.xml
index e91fb9483..86ee0d885 100644
--- a/querydsl-scala/pom.xml
+++ b/querydsl-scala/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml
index 68a9e3bd1..3d9b575c3 100644
--- a/querydsl-sql-codegen/pom.xml
+++ b/querydsl-sql-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 960bebec0..39ed2e003 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3.BUILD-SNAPSHOT</version>
+    <version>3.3.3</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
@@ -287,4 +287,4 @@
     </repository>
   </repositories>
   
-</project>
+</project>

From 09206d452c61dc2d58eb0df7daa3590ba5ed6a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Fri, 2 May 2014 22:16:20 +0300
Subject: [PATCH 17/20] Bump version

---
 querydsl-apt/pom.xml              | 2 +-
 querydsl-codegen/pom.xml          | 2 +-
 querydsl-collections/pom.xml      | 2 +-
 querydsl-core/pom.xml             | 2 +-
 querydsl-hibernate-search/pom.xml | 2 +-
 querydsl-jdo/pom.xml              | 2 +-
 querydsl-jpa-codegen/pom.xml      | 2 +-
 querydsl-jpa/pom.xml              | 2 +-
 querydsl-lucene3/pom.xml          | 2 +-
 querydsl-lucene4/pom.xml          | 2 +-
 querydsl-maven-plugin/pom.xml     | 2 +-
 querydsl-mongodb/pom.xml          | 2 +-
 querydsl-root/pom.xml             | 2 +-
 querydsl-scala/pom.xml            | 2 +-
 querydsl-sql-codegen/pom.xml      | 2 +-
 querydsl-sql/pom.xml              | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index 1b2100748..d41fc83c2 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-codegen/pom.xml b/querydsl-codegen/pom.xml
index 00dd431bc..24f4ebd25 100644
--- a/querydsl-codegen/pom.xml
+++ b/querydsl-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index 54517b9f9..f1cd23241 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath>
   </parent>
 
diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
index fe1f76108..7cc6aea70 100644
--- a/querydsl-core/pom.xml
+++ b/querydsl-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-hibernate-search/pom.xml b/querydsl-hibernate-search/pom.xml
index 727b240b8..2e3d26f88 100644
--- a/querydsl-hibernate-search/pom.xml
+++ b/querydsl-hibernate-search/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml
index eaa9d04a1..022ae93a6 100644
--- a/querydsl-jdo/pom.xml
+++ b/querydsl-jdo/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-jpa-codegen/pom.xml b/querydsl-jpa-codegen/pom.xml
index 1696b5b9e..e5926d023 100644
--- a/querydsl-jpa-codegen/pom.xml
+++ b/querydsl-jpa-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 2c4e96fc5..f524f1e8e 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-lucene3/pom.xml b/querydsl-lucene3/pom.xml
index 62cf8f1d4..0ba880afd 100644
--- a/querydsl-lucene3/pom.xml
+++ b/querydsl-lucene3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-lucene4/pom.xml b/querydsl-lucene4/pom.xml
index 8ceea9a35..39ec8d2c9 100644
--- a/querydsl-lucene4/pom.xml
+++ b/querydsl-lucene4/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-maven-plugin/pom.xml b/querydsl-maven-plugin/pom.xml
index c16a29454..2fdf3cac5 100644
--- a/querydsl-maven-plugin/pom.xml
+++ b/querydsl-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-mongodb/pom.xml b/querydsl-mongodb/pom.xml
index c40bfaf30..d2297fe15 100644
--- a/querydsl-mongodb/pom.xml
+++ b/querydsl-mongodb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath>
   </parent>
 
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index f25496595..c8159db02 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>3.3.3</version>
+  <version>3.3.4.BUILD-SNAPSHOT</version>
   <name>Querydsl</name>
   <description>parent project for Querydsl modules</description>
   <url>http://www.querydsl.com</url>
diff --git a/querydsl-scala/pom.xml b/querydsl-scala/pom.xml
index 86ee0d885..1b9c5da31 100644
--- a/querydsl-scala/pom.xml
+++ b/querydsl-scala/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml
index 3d9b575c3..659b07670 100644
--- a/querydsl-sql-codegen/pom.xml
+++ b/querydsl-sql-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 39ed2e003..662932cba 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4.BUILD-SNAPSHOT</version>
     <relativePath>../querydsl-root/pom.xml</relativePath> 
   </parent>
 

From 1cd43d69687571557135be4b850cbe3d08b4c413 Mon Sep 17 00:00:00 2001
From: Ruben Dijkstra <ruben.dijkstra@hva.nl>
Date: Fri, 2 May 2014 23:58:30 +0200
Subject: [PATCH 18/20] Simplify signature.

---
 .../src/test/java/com/mysema/query/ExtendedSQLQuery.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java b/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java
index c92dde24e..7e3d96a4e 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java
@@ -19,7 +19,6 @@ import java.util.List;
 import com.mysema.commons.lang.CloseableIterator;
 import com.mysema.query.sql.AbstractSQLQuery;
 import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLCommonQuery;
 import com.mysema.query.sql.SQLTemplates;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.FactoryExpression;
@@ -29,7 +28,7 @@ import com.mysema.query.types.QBean;
  * @author tiwe
  *
  */
-public class ExtendedSQLQuery extends AbstractSQLQuery<ExtendedSQLQuery> implements SQLCommonQuery<ExtendedSQLQuery> {
+public class ExtendedSQLQuery extends AbstractSQLQuery<ExtendedSQLQuery> {
 
     public ExtendedSQLQuery(SQLTemplates templates) {
         super(null, new Configuration(templates), new DefaultQueryMetadata());

From 5d8a60ae963d672909658a6ddb28576cbea1249f Mon Sep 17 00:00:00 2001
From: Ruben Dijkstra <ruben.dijkstra@hva.nl>
Date: Sat, 3 May 2014 00:08:42 +0200
Subject: [PATCH 19/20] Use of EnumMaps instead of HashMaps for enums.

---
 .../java/com/mysema/query/jpa/JPQLSerializer.java     |  4 ++--
 .../java/com/mysema/query/sql/SQLExpressions.java     | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
index 0d2cc5790..c1fddf7ce 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
@@ -15,7 +15,7 @@ package com.mysema.query.jpa;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -98,7 +98,7 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
 
     private static final String ON = " on ";
 
-    private static final Map<JoinType, String> joinTypes = new HashMap<JoinType, String>();
+    private static final Map<JoinType, String> joinTypes = new EnumMap<JoinType, String>(JoinType.class);
 
     private final JPQLTemplates templates;
 
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java
index 1735e1d06..f76bd0040 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java
@@ -13,7 +13,7 @@
  */
 package com.mysema.query.sql;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 import com.mysema.query.types.ConstantImpl;
@@ -43,11 +43,14 @@ import com.mysema.query.types.expr.Wildcard;
 @SuppressWarnings("rawtypes")
 public final class SQLExpressions {
 
-    private static final Map<DatePart, Operator> DATE_ADD_OPS = new HashMap<DatePart, Operator>();
+    private static final Map<DatePart, Operator> DATE_ADD_OPS
+            = new EnumMap<DatePart, Operator>(DatePart.class);
 
-    private static final Map<DatePart, Operator> DATE_DIFF_OPS = new HashMap<DatePart, Operator>();
+    private static final Map<DatePart, Operator> DATE_DIFF_OPS
+            = new EnumMap<DatePart, Operator>(DatePart.class);
 
-    private static final Map<DatePart, Operator> DATE_TRUNC_OPS = new HashMap<DatePart, Operator>();
+    private static final Map<DatePart, Operator> DATE_TRUNC_OPS
+            = new EnumMap<DatePart, Operator>(DatePart.class);
 
     static {
         DATE_ADD_OPS.put(DatePart.year, Ops.DateTimeOps.ADD_YEARS);

From aea01551e9d8e677f708efa9f34d7bba0eac9a9f Mon Sep 17 00:00:00 2001
From: Ruben Dijkstra <ruben.dijkstra@hva.nl>
Date: Sat, 3 May 2014 11:27:24 +0200
Subject: [PATCH 20/20] Use of EnumMaps instead of HashMaps for enums.

---
 .../java/com/mysema/query/codegen/TypeMappings.java    | 10 +++++++---
 .../mysema/query/codegen/EmbeddableSerializerTest.java |  8 +++++---
 .../com/mysema/query/codegen/EntitySerializerTest.java |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java
index 526f20e6a..f3ba67c19 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java
+++ b/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java
@@ -14,6 +14,7 @@
 package com.mysema.query.codegen;
 
 import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 import javax.annotation.Nullable;
@@ -38,11 +39,14 @@ public abstract class TypeMappings {
 
     private final Map<String, Type> queryTypes = new HashMap<String, Type>();
 
-    private final Map<TypeCategory, Type> exprTypes = new HashMap<TypeCategory, Type>();
+    private final Map<TypeCategory, Type> exprTypes
+            = new EnumMap<TypeCategory, Type>(TypeCategory.class);
 
-    private final Map<TypeCategory, Type> pathTypes = new HashMap<TypeCategory, Type>();
+    private final Map<TypeCategory, Type> pathTypes
+            = new EnumMap<TypeCategory, Type>(TypeCategory.class);
 
-    private final Map<TypeCategory, Type> templateTypes = new HashMap<TypeCategory, Type>();
+    private final Map<TypeCategory, Type> templateTypes
+            = new EnumMap<TypeCategory, Type>(TypeCategory.class);
     
     public Type getTemplateType(Type type, EntityType model, boolean raw) {
         return getTemplateType(type, model, raw, false, false);
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java
index 277ff5d8b..bc0f1acb3 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java
+++ b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java
@@ -13,19 +13,20 @@
  */
 package com.mysema.query.codegen;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.sql.Time;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 import com.mysema.codegen.JavaWriter;
 import com.mysema.codegen.model.*;
 import com.mysema.query.annotations.PropertyType;
 import org.junit.Test;
-import static org.junit.Assert.assertTrue;
 
 public class EmbeddableSerializerTest {
 
@@ -57,7 +58,8 @@ public class EmbeddableSerializerTest {
 
     @Test
     public void OriginalCategory() throws IOException{
-        Map<TypeCategory, String> categoryToSuperClass = new HashMap<TypeCategory, String>();
+        Map<TypeCategory, String> categoryToSuperClass
+                = new EnumMap<TypeCategory, String>(TypeCategory.class);
         categoryToSuperClass.put(TypeCategory.COMPARABLE, "ComparablePath<Entity>");
         categoryToSuperClass.put(TypeCategory.ENUM, "EnumPath<Entity>");
         categoryToSuperClass.put(TypeCategory.DATE, "DatePath<Entity>");
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java
index c6c2f56ce..58c5a2baa 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java
+++ b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java
@@ -20,7 +20,7 @@ import java.io.StringWriter;
 import java.sql.Time;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 import org.junit.Test;
@@ -69,7 +69,6 @@ public class EntitySerializerTest {
         		"extends EntityPathBase<EntitySerializerTest.Entity>"));
     }
     
-
     @Test
     public void No_Package() throws IOException {
         SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
@@ -82,7 +81,8 @@ public class EntitySerializerTest {
 
     @Test
     public void OriginalCategory() throws IOException{
-        Map<TypeCategory, String> categoryToSuperClass = new HashMap<TypeCategory, String>();
+        Map<TypeCategory, String> categoryToSuperClass
+                = new EnumMap<TypeCategory, String>(TypeCategory.class);
         categoryToSuperClass.put(TypeCategory.COMPARABLE, "ComparablePath<Entity>");
         categoryToSuperClass.put(TypeCategory.ENUM, "EnumPath<Entity>");
         categoryToSuperClass.put(TypeCategory.DATE, "DatePath<Entity>");