style: Clean up CreateTable.toString() and fix CheckConstraint null name bug

CreateTable: replace String += concatenation with StringBuilder, split
into appendCreateClause/appendColumnDefinitions/appendTableOptions/
appendTableProperties helpers.

CheckConstraint: fix toString() emitting "CONSTRAINT null CHECK (...)"
for unnamed constraints; now omits the CONSTRAINT prefix when unnamed.

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
Signed-off-by: manticore-projects <andreas@manticore-projects.com>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java

@@ -39,7 +39,12 @@ public void setExpression(Expression expression) {
 
     @Override
     public String toString() {
-        return "CONSTRAINT " + getName() + " CHECK (" + expression + ")";
+        StringBuilder b = new StringBuilder();
+        if (getName() != null) {
+            b.append("CONSTRAINT ").append(getName()).append(" ");
+        }
+        b.append("CHECK (").append(expression).append(")");
+        return b.toString();
     }
 
     public CheckConstraint withTable(Table table) {

src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java

@@ -167,48 +167,84 @@ public void setRowMovement(RowMovement rowMovement) {
     @Override
     @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
     public String toString() {
-        String sql;
+        StringBuilder b = new StringBuilder();
+        appendCreateClause(b);
+        appendColumnDefinitions(b);
+        appendTableOptions(b);
+        appendTableProperties(b);
+        return b.toString();
+    }
+
+    private void appendCreateClause(StringBuilder b) {
         String createOps = PlainSelect.getStringList(createOptionsStrings, false, false);
 
-        sql = "CREATE " + (unlogged ? "UNLOGGED " : "")
-                + (!"".equals(createOps) ? createOps + " " : "")
-                + (orReplace ? "OR REPLACE " : "")
-                + "TABLE " + (ifNotExists ? "IF NOT EXISTS " : "") + table;
+        b.append("CREATE ");
+        if (unlogged) {
+            b.append("UNLOGGED ");
+        }
+        if (!"".equals(createOps)) {
+            b.append(createOps).append(" ");
+        }
+        if (orReplace) {
+            b.append("OR REPLACE ");
+        }
+        b.append("TABLE ");
+        if (ifNotExists) {
+            b.append("IF NOT EXISTS ");
+        }
+        b.append(table);
+    }
 
+    private void appendColumnDefinitions(StringBuilder b) {
         if (columns != null && !columns.isEmpty()) {
-            sql += " ";
-            sql += PlainSelect.getStringList(columns, true, true);
+            b.append(" ");
+            b.append(PlainSelect.getStringList(columns, true, true));
         }
         if (columnDefinitions != null && !columnDefinitions.isEmpty()) {
-            sql += " (";
-
-            sql += PlainSelect.getStringList(columnDefinitions, true, false);
+            b.append(" (");
+            b.append(PlainSelect.getStringList(columnDefinitions, true, false));
             if (indexes != null && !indexes.isEmpty()) {
-                sql += ", ";
-                sql += PlainSelect.getStringList(indexes);
+                b.append(", ");
+                b.append(PlainSelect.getStringList(indexes));
             }
-            sql += ")";
+            b.append(")");
         }
+    }
+
+    private void appendTableOptions(StringBuilder b) {
         String options = PlainSelect.getStringList(tableOptionsStrings, false, false);
         if (options != null && options.length() > 0) {
-            sql += " " + options;
+            b.append(" ").append(options);
         }
+    }
 
+    private void appendTableProperties(StringBuilder b) {
         if (rowMovement != null) {
-            sql += " " + rowMovement.getMode().toString() + " ROW MOVEMENT";
+            b.append(" ").append(rowMovement.getMode()).append(" ROW MOVEMENT");
         }
         if (select != null) {
-            sql += " AS " + (selectParenthesis ? "(" : "") + select.toString()
-                    + (selectParenthesis ? ")" : "");
+            b.append(" AS ");
+            if (selectParenthesis) {
+                b.append("(");
+            }
+            b.append(select);
+            if (selectParenthesis) {
+                b.append(")");
+            }
         }
         if (likeTable != null) {
-            sql += " LIKE " + (selectParenthesis ? "(" : "") + likeTable.toString()
-                    + (selectParenthesis ? ")" : "");
+            b.append(" LIKE ");
+            if (selectParenthesis) {
+                b.append("(");
+            }
+            b.append(likeTable);
+            if (selectParenthesis) {
+                b.append(")");
+            }
         }
         if (interleaveIn != null) {
-            sql += ", " + interleaveIn;
+            b.append(", ").append(interleaveIn);
         }
-        return sql;
     }
 
     public CreateTable withTable(Table table) {