From be5a63cded3abb45e7118fa6a5f598642e9a7447 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 18 Aug 2016 14:00:22 +0200 Subject: [PATCH] [#5488] Excess newline in formatted SELECT without FROM clause --- jOOQ/src/main/java/org/jooq/impl/QueryPartList.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/WithImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java index 31e8f0820b..0014c927ac 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java @@ -99,14 +99,14 @@ class QueryPartList extends AbstractQueryPart implements Li ctx.sql(separator); if (i > 0 || indent) - ctx.formatNewLine(); + ctx.formatSeparator(); ctx.visit(get(i)); - separator = ", "; + separator = ","; } if (indent) - ctx.formatIndentEnd().formatNewLine(); + ctx.formatIndentEnd(); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index 84720703a1..b4fc65af4c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -190,7 +190,7 @@ implements ctx.keyword("with") .sql(' '); - if (recursive && !asList().contains(ctx.configuration().dialect().family())) + if (recursive && !asList().contains(ctx.family())) ctx.keyword("recursive") .sql(' ');