diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
index 6d1c5478e8..8c95af60fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
@@ -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)
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index 84b580e948..e7ae17e34f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -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();
+            }
+        }
     }