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 09:04:55 +02:00
parent 4c72fe508d
commit f957a1e7ee
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,11 +210,9 @@ implements
else {
boolean qualify = ctx.qualify();
if (named ) {
ctx.visit(K_CONSTRAINT)
.sql(' ')
.visit(getUnqualifiedName());
}
if (named )
ctx.visit(K_CONSTRAINT).sql(' ')
.visit(getUnqualifiedName()).sql(' ');
if (unique != null) {
ctx.visit(K_UNIQUE)

24
jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
View File

@ -190,14 +190,28 @@ implements
Tools.toSQLDDLTypeDeclaration(ctx, dataType);
if (default_ != null)
ctx.formatSeparator().visit(K_DEFAULT).sql(' ').visit(default_);
ctx.sql(' ').visit(K_DEFAULT).sql(' ').visit(default_);
if (!Tools.isEmpty(constraints))
if (ctx.family() == FIREBIRD)
if (!Tools.isEmpty(constraints)) {
if (ctx.family() == FIREBIRD) {
ctx.formatSeparator().visit(DSL.check(DSL.and(Tools.map(constraints, c -> ((ConstraintImpl) c).$check()))));
else
}
else {
boolean indent = constraints.size() > 1;
if (indent)
ctx.formatSeparator().formatIndentStart();
for (Constraint constraint : constraints)
ctx.formatSeparator().visit(constraint);
if (indent)
ctx.formatSeparator().visit(constraint);
else
ctx.sql(' ').visit(constraint);
if (indent)
ctx.formatIndentEnd();
}
}
}