[#6987] Add DDLFlag.COMMENT to extract COMMENT statements from DSLCon…

…text.ddl()
jOOQ · Jan 4, 2018 · e841e20 · e841e20
1 parent af5fd2f
commit e841e20
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/DDL.java b/jOOQ/src/main/java/org/jooq/impl/DDL.java
@@ -145,22 +145,30 @@ final Queries queries(Table<?>... tables) {
             else
                 queries.addAll(alterTableAddConstraints(table));
 
-            if (flags.contains(COMMENT)) {
-                String tComment = table.getComment();
+            queries.addAll(commentOn(table));
+        }
+
+        return ctx.queries(queries);
+    }
+
+    private List<Query> commentOn(Table<?> table) {
+        List<Query> result = new ArrayList<Query>();
 
-                if (!StringUtils.isEmpty(tComment))
-                    queries.add(ctx.commentOnTable(table).is(tComment));
+        if (flags.contains(COMMENT)) {
+            String tComment = table.getComment();
 
-                for (Field<?> field : table.fields()) {
-                    String fComment = field.getComment();
+            if (!StringUtils.isEmpty(tComment))
+                result.add(ctx.commentOnTable(table).is(tComment));
 
-                    if (!StringUtils.isEmpty(fComment))
-                        queries.add(ctx.commentOnColumn(field).is(fComment));
-                }
+            for (Field<?> field : table.fields()) {
+                String fComment = field.getComment();
+
+                if (!StringUtils.isEmpty(fComment))
+                    result.add(ctx.commentOnColumn(field).is(fComment));
             }
         }
 
-        return ctx.queries(queries);
+        return result;
     }
 
     final Queries queries(Schema schema) {
@@ -200,6 +208,10 @@ final Queries queries(Schema schema) {
                 for (Constraint constraint : foreignKeys(table))
                     queries.add(ctx.alterTable(table).add(constraint));
 
+        if (flags.contains(COMMENT))
+            for (Table<?> table : schema.getTables())
+                queries.addAll(commentOn(table));
+
         return ctx.queries(queries);
     }