From 4c72fe508d25bda15ce4159fb5989306cb7390f4 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 14 Sep 2023 08:56:48 +0200 Subject: [PATCH] [jOOQ/jOOQ#15591] Remove unnecessary line breaks in formatted DDL --- .../java/org/jooq/impl/AlterIndexImpl.java | 5 +- .../java/org/jooq/impl/AlterSchemaImpl.java | 6 +- .../java/org/jooq/impl/AlterTableImpl.java | 63 +++++-------------- .../java/org/jooq/impl/AlterViewImpl.java | 6 +- .../java/org/jooq/impl/ConstraintImpl.java | 17 +---- 5 files changed, 22 insertions(+), 75 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java index d57b59d39c..9efdf12006 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java @@ -226,9 +226,7 @@ implements else ctx.visit(index); - ctx.end(Clause.ALTER_INDEX_INDEX) - .formatIndentStart() - .formatSeparator(); + ctx.end(Clause.ALTER_INDEX_INDEX); if (renameTo != null) ctx.start(Clause.ALTER_INDEX_RENAME) @@ -236,7 +234,6 @@ implements .qualify(false, c -> c.visit(renameTo)) .end(Clause.ALTER_INDEX_RENAME); - ctx.formatIndentEnd(); break; } } diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java index 30a2cb1d4e..08d69c6859 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java @@ -172,17 +172,13 @@ implements ctx.sql(' ').visit(K_IF_EXISTS); ctx.sql(' ').visit(schema) - .end(Clause.ALTER_SCHEMA_SCHEMA) - .formatIndentStart() - .formatSeparator(); + .end(Clause.ALTER_SCHEMA_SCHEMA); if (renameTo != null) ctx.start(Clause.ALTER_SCHEMA_RENAME) .visit(supportRename ? K_TO : K_RENAME_TO).sql(' ') .qualify(false, c -> c.visit(renameTo)) .end(Clause.ALTER_SCHEMA_RENAME); - - ctx.formatIndentEnd(); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java index 0d182b4ae0..a2d18007a3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java @@ -1187,10 +1187,8 @@ implements if (ifExists && supportsIfExists(ctx)) ctx.sql(' ').visit(K_IF_EXISTS); - ctx.sql(' ').visit(table) - .end(ALTER_TABLE_TABLE) - .formatIndentStart() - .formatSeparator(); + ctx.sql(' ').visit(table).sql(' ') + .end(ALTER_TABLE_TABLE); } if (comment != null) { @@ -1220,30 +1218,21 @@ implements case DERBY: - ctx.visit(K_RENAME_COLUMN).sql(' ') - .visit(renameColumn) - .formatSeparator() - .visit(K_TO).sql(' ') - .qualify(false, c -> c.visit(renameColumnTo)); + ctx.visit(K_RENAME_COLUMN).sql(' ').visit(renameColumn).sql(' ') + .visit(K_TO).sql(' ').qualify(false, c -> c.visit(renameColumnTo)); break; case H2: case HSQLDB: - ctx.visit(K_ALTER_COLUMN).sql(' ') - .qualify(false, c -> c.visit(renameColumn)) - .formatSeparator() - .visit(K_RENAME_TO).sql(' ') - .qualify(false, c -> c.visit(renameColumnTo)); + ctx.visit(K_ALTER_COLUMN).sql(' ').qualify(false, c -> c.visit(renameColumn)).sql(' ') + .visit(K_RENAME_TO).sql(' ').qualify(false, c -> c.visit(renameColumnTo)); break; case FIREBIRD: - ctx.visit(K_ALTER_COLUMN).sql(' ') - .qualify(false, c -> c.visit(renameColumn)) - .formatSeparator() - .visit(K_TO).sql(' ') - .qualify(false, c -> c.visit(renameColumnTo)); + ctx.visit(K_ALTER_COLUMN).sql(' ').qualify(false, c -> c.visit(renameColumn)).sql(' ') + .visit(K_TO).sql(' ').qualify(false, c -> c.visit(renameColumnTo)); break; @@ -1261,18 +1250,10 @@ implements - - - - - default: - ctx.visit(K_RENAME_COLUMN).sql(' ') - .qualify(false, c -> c.visit(renameColumn)) - .formatSeparator() - .visit(K_TO).sql(' ') - .qualify(false, c -> c.visit(renameColumnTo)); + ctx.visit(K_RENAME_COLUMN).sql(' ').qualify(false, c -> c.visit(renameColumn)).sql(' ') + .visit(K_TO).sql(' ').qualify(false, c -> c.visit(renameColumnTo)); break; } @@ -1281,28 +1262,20 @@ implements } else if (renameIndex != null) { ctx.start(ALTER_TABLE_RENAME_INDEX) - .visit(K_RENAME_INDEX).sql(' ') - .qualify(false, c -> c.visit(renameIndex)) - .formatSeparator() - .visit(K_TO).sql(' ') - .qualify(false, c -> c.visit(renameIndexTo)) + .visit(K_RENAME_INDEX).sql(' ').qualify(false, c -> c.visit(renameIndex)).sql(' ') + .visit(K_TO).sql(' ').qualify(false, c -> c.visit(renameIndexTo)) .end(ALTER_TABLE_RENAME_INDEX); } else if (renameConstraint != null) { ctx.start(ALTER_TABLE_RENAME_CONSTRAINT); ctx.data(DATA_CONSTRAINT_REFERENCE, true, c1 -> { if (family == HSQLDB) - c1.visit(K_ALTER_CONSTRAINT).sql(' ') - .qualify(false, c2 -> c2.visit(renameConstraint)) - .formatSeparator() - .visit(K_RENAME_TO).sql(' ') - .qualify(false, c2 -> c2.visit(renameConstraintTo)); + c1.visit(K_ALTER_CONSTRAINT).sql(' ').qualify(false, c2 -> c2.visit(renameConstraint)).sql(' ') + .visit(K_RENAME_TO).sql(' ').qualify(false, c2 -> c2.visit(renameConstraintTo)); else c1.visit( K_RENAME_CONSTRAINT).sql(' ') - .qualify(false, c2 -> c2.visit(renameConstraint)) - .formatSeparator() - .visit(K_TO).sql(' ') - .qualify(false, c2 -> c2.visit(renameConstraintTo)); + .qualify(false, c2 -> c2.visit(renameConstraint)).sql(' ') + .visit(K_TO).sql(' ').qualify(false, c2 -> c2.visit(renameConstraintTo)); }); ctx.end(ALTER_TABLE_RENAME_CONSTRAINT); @@ -1653,7 +1626,6 @@ implements - ctx.end(ALTER_TABLE_DROP); } else if (dropConstraint != null) { @@ -1689,9 +1661,6 @@ implements ctx.visit(K_DROP).sql(' ').visit(K_PRIMARY_KEY); ctx.end(ALTER_TABLE_DROP); } - - if (!omitAlterTable) - ctx.formatIndentEnd(); } private final boolean unqualifyRenameTo(Context ctx) { diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java index 83ab5f689d..287f4429d2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java @@ -326,17 +326,13 @@ implements ctx.sql(' ').visit(K_IF_EXISTS); ctx.sql(' ').visit(view) - .end(Clause.ALTER_VIEW_VIEW) - .formatIndentStart() - .formatSeparator(); + .end(Clause.ALTER_VIEW_VIEW); if (renameTo != null) ctx.start(Clause.ALTER_VIEW_RENAME) .visit(K_RENAME_TO).sql(' ') .qualify(false, c -> c.visit(renameTo)) .end(Clause.ALTER_VIEW_RENAME); - - ctx.formatIndentEnd(); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java index ac23ce0b39..6d1c5478e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java @@ -213,9 +213,7 @@ implements if (named ) { ctx.visit(K_CONSTRAINT) .sql(' ') - .visit(getUnqualifiedName()) - .formatIndentStart() - .formatSeparator(); + .visit(getUnqualifiedName()); } if (unique != null) { @@ -244,11 +242,8 @@ implements } else if (foreignKey != null) { ctx.visit(K_FOREIGN_KEY) - .sql(" (").visit(wrap(foreignKey).qualify(false)).sql(')') - .formatSeparator() - .visit(K_REFERENCES) - .sql(' ') - .visit(referencesTable); + .sql(" (").visit(wrap(foreignKey).qualify(false)).sql(") ") + .visit(K_REFERENCES).sql(' ').visit(referencesTable); if (references.length > 0) ctx.sql(" (").visit(wrap(references).qualify(false)).sql(')'); @@ -275,7 +270,6 @@ implements if (!enforced) acceptEnforced(ctx, enforced); - if (named) { @@ -283,11 +277,6 @@ implements - - - - ctx.formatIndentEnd(); - } } }