From 02a773d5e39d976511f6b9859117ad80698ee5ed Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 9 Feb 2018 14:16:16 +0100
Subject: [PATCH] [#1502] Minor fixes

---
 .../java/org/jooq/impl/AbstractContext.java   | 20 +++++++++----------
 jOOQ/src/main/java/org/jooq/impl/Alias.java   |  4 ++--
 .../main/java/org/jooq/impl/QueriesImpl.java  | 12 +----------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
index 9d80f1c883..80d8b62582 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
@@ -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;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java
index 4b6ae1440b..56c495e79c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Alias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java
@@ -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);
diff --git a/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java b/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
index ba0ffaad07..2abd60923c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
@@ -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();
-    }
 }