github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1502] Minor fixes

Browse Source
This commit is contained in:
lukaseder 2018-02-09 14:16:16 +01:00
parent 49fe6ebebf
commit 02a773d5e3
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
View File

@ -522,26 +522,24 @@ abstract class AbstractContext<C extends Context<C>> extends AbstractScope imple
return (C) this;
}
@Override
public final C scopeMarkStart(QueryPart part) {
if (scopeLevel >= 0 && scopeMarking == 0)
scopeMarkStart0(part);
scopeMarking++;
return (C) this;
}
@Override
public /* non-final */ C scopeRegister(QueryPart part) {
return (C) this;
}
@Override
public final C scopeMarkStart(QueryPart part) {
if (scopeLevel >= 0 && scopeMarking++ == 0)
scopeMarkStart0(part);
return (C) this;
}
@Override
public final C scopeMarkEnd(QueryPart part) {
if (scopeLevel >= 0 && scopeMarking == 1)
if (scopeLevel >= 0 && --scopeMarking == 0)
scopeMarkEnd0(part);
scopeMarking--;
return (C) this;
}

4
jOOQ/src/main/java/org/jooq/impl/Alias.java
View File

@ -131,7 +131,7 @@ final class Alias<Q extends QueryPart> extends AbstractQueryPart {
if (context.declareAliases() && (context.declareFields() || context.declareTables())) {
context.declareAliases(false);
if (wrapped instanceof Table)
if (wrapped instanceof TableImpl)
context.scopeMarkStart(wrapping);
SQLDialect family = context.family();
@ -241,7 +241,7 @@ final class Alias<Q extends QueryPart> extends AbstractQueryPart {
}
}
if (wrapped instanceof Table)
if (wrapped instanceof TableImpl)
context.scopeMarkEnd(wrapping);
context.declareAliases(true);

12
jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
View File

@ -154,7 +154,7 @@ final class QueriesImpl extends AbstractQueryPart implements Queries {
@Override
public final void accept(Context<?> ctx) {
for (Query query : this)
ctx.visit(query).sql(';').formatNewLine();
ctx.visit(query).sql(';').formatSeparator();
}
@Override
@ -181,14 +181,4 @@ final class QueriesImpl extends AbstractQueryPart implements Queries {
return queries.equals(((QueriesImpl) obj).queries);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
for (Query query : queries)
sb.append(query).append(";\n");
return sb.toString();
}
}