github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#15591] Remove unnecessary line breaks in formatted DDL

Browse Source
This commit is contained in:
Lukas Eder 2023-09-14 08:56:48 +02:00
parent abdf5bd2b5
commit 4c72fe508d
5 changed files with 22 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
View File

@ -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;
}
}

6
jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
View File

@ -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

63
jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
View File

@ -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) {

6
jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
View File

@ -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

17
jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
View File

@ -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();
}
}
}