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

#304 improved SQL query and join flags serialization

Browse Source
This commit is contained in:
Timo Westkämper 2012-12-06 14:50:34 +02:00
parent 8636ba4cb7
commit ca5256dec0
2 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
querydsl-core/src/main/java/com/mysema/query/support/SerializerBase.java
View File

@ -138,7 +138,7 @@ public abstract class SerializerBase<S extends SerializerBase<S>> implements Vis
}
}
protected boolean serialize(QueryFlag.Position position, Set<QueryFlag> flags) {
protected final boolean serialize(QueryFlag.Position position, Set<QueryFlag> flags) {
boolean handled = false;
for (QueryFlag flag : flags) {
if (flag.getPosition() == position) {
@ -149,7 +149,7 @@ public abstract class SerializerBase<S extends SerializerBase<S>> implements Vis
return handled;
}
protected boolean serialize(JoinFlag.Position position, Set<JoinFlag> flags){
protected final boolean serialize(JoinFlag.Position position, Set<JoinFlag> flags){
boolean handled = false;
for (JoinFlag flag : flags) {
if (flag.getPosition() == position) {

88
querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
View File

@ -178,6 +178,7 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
Predicate having = metadata.getHaving();
List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
Set<QueryFlag> flags = metadata.getFlags();
final boolean hasFlags = !flags.isEmpty();
List<Expression<?>> sqlSelect = new ArrayList<Expression<?>>(select.size());
for (Expression<?> selectExpr : select) {
@ -190,14 +191,18 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
}
// start
serialize(Position.START, flags);
if (hasFlags) {
serialize(Position.START, flags);
}
// select
Stage oldStage = stage;
stage = Stage.SELECT;
if (forCountRow) {
append(templates.getSelect());
serialize(Position.AFTER_SELECT, flags);
append(templates.getSelect());
if (hasFlags) {
serialize(Position.AFTER_SELECT, flags);
}
if (!metadata.isDistinct()) {
append(templates.getCountStar());
@ -217,11 +222,15 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
} else {
append(templates.getSelectDistinct());
}
serialize(Position.AFTER_SELECT, flags);
if (hasFlags) {
serialize(Position.AFTER_SELECT, flags);
}
handle(COMMA, sqlSelect);
}
serialize(Position.AFTER_PROJECTION, flags);
if (hasFlags) {
serialize(Position.AFTER_PROJECTION, flags);
}
// from
stage = Stage.FROM;
@ -229,31 +238,45 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
// where
stage = Stage.WHERE;
serialize(Position.BEFORE_FILTERS, flags);
if (hasFlags) {
serialize(Position.BEFORE_FILTERS, flags);
}
if (where != null) {
append(templates.getWhere()).handle(where);
serialize(Position.AFTER_FILTERS, flags);
if (hasFlags) {
serialize(Position.AFTER_FILTERS, flags);
}
}
// group by
stage = Stage.GROUP_BY;
serialize(Position.BEFORE_GROUP_BY, flags);
if (hasFlags) {
serialize(Position.BEFORE_GROUP_BY, flags);
}
if (!groupBy.isEmpty()) {
append(templates.getGroupBy()).handle(COMMA, groupBy);
serialize(Position.AFTER_GROUP_BY, flags);
if (hasFlags) {
serialize(Position.AFTER_GROUP_BY, flags);
}
}
// having
stage = Stage.HAVING;
serialize(Position.BEFORE_HAVING, flags);
if (hasFlags) {
serialize(Position.BEFORE_HAVING, flags);
}
if (having != null) {
append(templates.getHaving()).handle(having);
serialize(Position.AFTER_HAVING, flags);
if (hasFlags) {
serialize(Position.AFTER_HAVING, flags);
}
}
// order by
stage = Stage.ORDER_BY;
serialize(Position.BEFORE_ORDER, flags);
if (hasFlags) {
serialize(Position.BEFORE_ORDER, flags);
}
if (!orderBy.isEmpty() && !forCountRow) {
append(templates.getOrderBy());
boolean first = true;
@ -265,7 +288,9 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
append(os.getOrder() == Order.ASC ? templates.getAsc() : templates.getDesc());
first = false;
}
serialize(Position.AFTER_ORDER, flags);
if (hasFlags) {
serialize(Position.AFTER_ORDER, flags);
}
}
if (!forCountRow && metadata.getModifiers().isRestricting() && !joins.isEmpty()) {
@ -273,7 +298,9 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
}
// end
serialize(Position.END, flags);
if (hasFlags) {
serialize(Position.END, flags);
}
// reset stage
stage = oldStage;
@ -434,20 +461,27 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
append(templates.getFrom());
for (int i = 0; i < joins.size(); i++) {
JoinExpression je = joins.get(i);
serialize(JoinFlag.Position.START, je.getFlags());
if (!serialize(JoinFlag.Position.OVERRIDE, je.getFlags()) && i > 0) {
append(templates.getJoinSymbol(je.getType()));
if (je.getFlags().isEmpty()) {
if (i > 0) {
append(templates.getJoinSymbol(je.getType()));
}
handleJoinTarget(je);
if (je.getCondition() != null) {
append(templates.getOn()).handle(je.getCondition());
}
} else {
serialize(JoinFlag.Position.START, je.getFlags());
if (!serialize(JoinFlag.Position.OVERRIDE, je.getFlags()) && i > 0) {
append(templates.getJoinSymbol(je.getType()));
}
serialize(JoinFlag.Position.BEFORE_TARGET, je.getFlags());
handleJoinTarget(je);
serialize(JoinFlag.Position.BEFORE_CONDITION, je.getFlags());
if (je.getCondition() != null) {
append(templates.getOn()).handle(je.getCondition());
}
serialize(JoinFlag.Position.END, je.getFlags());
}
serialize(JoinFlag.Position.BEFORE_TARGET, je.getFlags());
handleJoinTarget(je);
serialize(JoinFlag.Position.BEFORE_CONDITION, je.getFlags());
if (je.getCondition() != null) {
append(templates.getOn()).handle(je.getCondition());
}
serialize(JoinFlag.Position.END, je.getFlags());
}
}
}