From d2f3ce261a3d12da18149a250fc75d89f296fe03 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 29 Apr 2020 10:33:05 +0200 Subject: [PATCH] [jOOQ/jOOQ#10112] Fix formatting of nested JSON_OBJECT() --- .../main/java/org/jooq/impl/DefaultRenderContext.java | 9 +++------ .../main/java/org/jooq/impl/QueryPartCollectionView.java | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java index c2848ec2e8..f1cf9343d6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java @@ -712,12 +712,9 @@ class DefaultRenderContext extends AbstractContext implements Ren public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("rendering ["); - sb.append(render()); - sb.append("]\n"); - sb.append("parameters ["); - sb.append(paramType); - sb.append("]\n"); + sb.append("rendering [").append(render()).append("]\n"); + sb.append("formatting [").append(format()).append("]\n"); + sb.append("parameters [").append(paramType).append("]\n"); toString(sb); return sb.toString(); diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java index e2be466dd6..988df9df19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java @@ -112,7 +112,7 @@ class QueryPartCollectionView extends AbstractQueryPart imp rendersContent.set(i++, ((QueryPartInternal) e).rendersContent(ctx)); int size = rendersContent.cardinality(); - boolean format = size >= indentSize; + boolean format = ctx.format() && size >= indentSize; boolean previousQualify = ctx.qualify(); if (qualify != null) @@ -157,7 +157,7 @@ class QueryPartCollectionView extends AbstractQueryPart imp ctx.formatNewLine(); if (indent) { - ctx.data(DATA_LIST_ALREADY_INDENTED, part instanceof QueryPartCollectionView); + ctx.data(DATA_LIST_ALREADY_INDENTED, part instanceof QueryPartCollectionView && ((QueryPartCollectionView) part).size() > 1); ctx.visit(part); ctx.data(DATA_LIST_ALREADY_INDENTED, previousIndented); }