From 74c19a4273cfaa7b4fc528063b2b1def52c1670a Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Wed, 19 Apr 2017 11:33:40 +0200
Subject: [PATCH] [#6104] Improve VALUES constructor formatting

---
 jOOQ/src/main/java/org/jooq/impl/Values.java | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java
index 6702435d68..4f439676fb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Values.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Values.java
@@ -145,21 +145,25 @@ final class Values<R extends Record> extends AbstractTable<R> {
 
             default: {
                 ctx.start(TABLE_VALUES)
-                   .visit(K_VALUES)
-                   .formatIndentLockStart();
+                   .visit(K_VALUES);
 
-                boolean firstRow = true;
-                for (Row row : rows) {
-                    if (!firstRow) {
-                        ctx.sql(',').formatSeparator();
-                    }
+                if (rows.length > 1)
+                    ctx.formatIndentStart()
+                       .formatSeparator();
 
-                    ctx.visit(row);
-                    firstRow = false;
+                for (int i = 0; i < rows.length; i++) {
+                    if (i > 0)
+                        ctx.sql(',')
+                           .formatSeparator();
+
+                    ctx.visit(rows[i]);
                 }
 
-                ctx.formatIndentLockEnd()
-                   .end(TABLE_VALUES);
+                if (rows.length > 1)
+                    ctx.formatIndentEnd()
+                       .formatNewLine();
+
+                ctx.end(TABLE_VALUES);
                 break;
             }
         }