fixes #701

Author: wumpz

README.md

@@ -82,6 +82,7 @@ Also I would like to know about needed examples or documentation stuff.
 * support for **VIEW** as object name
 * functions hold now multipart names
 * support for **DISABLE** as object name
+* API change in `ColumnDefinition.setColumnSpecStrings` to `ColumnDefinition.setColumnSpecs` to better allow the merge between `AlterExpression.ColumnDataType` and `ColumnDefinition`
 
 ## Extensions of JSqlParser releases
 

src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java

@@ -11,9 +11,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
+import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 import net.sf.jsqlparser.statement.create.table.Index;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
@@ -320,49 +320,21 @@ public String toString() {
         return b.toString();
     }
 
-    public static class ColumnDataType {
-
-        private final String columnName;
+    public final static class ColumnDataType extends ColumnDefinition {
         private final boolean withType;
-        private final ColDataType colDataType;
-        private final List<String> columnSpecs;
 
         public ColumnDataType(String columnName, boolean withType, ColDataType colDataType, List<String> columnSpecs) {
-            this.columnName = columnName;
+            super(columnName, colDataType, columnSpecs);
             this.withType = withType;
-            this.colDataType = colDataType;
-            this.columnSpecs = columnSpecs;
-        }
-
-        public String getColumnName() {
-            return columnName;
-        }
-
-        public ColDataType getColDataType() {
-            return colDataType;
-        }
-
-        public List<String> getColumnSpecs() {
-            if (columnSpecs == null) {
-                return Collections.emptyList();
-            }
-            return Collections.unmodifiableList(columnSpecs);
         }
 
         @Override
         public String toString() {
-            return columnName + (withType ? " TYPE " : " ") + colDataType + parametersToString();
-        }
-
-        private String parametersToString() {
-            if (columnSpecs == null || columnSpecs.isEmpty()) {
-                return "";
-            }
-            return " " + PlainSelect.getStringList(columnSpecs, false, false);
+            return getColumnName() + (withType ? " TYPE " : " ") + toStringDataTypeAndSpec();
         }
     }
 
-    public static class ColumnDropNotNull {
+    public final static class ColumnDropNotNull {
 
         private final String columnName;
         private final boolean withNot;

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

@@ -13,18 +13,30 @@
 
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
+/**
+ * Globally used definition class for columns.
+ */
 public class ColumnDefinition {
 
     private String columnName;
     private ColDataType colDataType;
-    private List<String> columnSpecStrings;
+    private List<String> columnSpecs;
+
+    public ColumnDefinition() {
+    }
 
-    public List<String> getColumnSpecStrings() {
-        return columnSpecStrings;
+    public ColumnDefinition(String columnName, ColDataType colDataType, List<String> columnSpecs) {
+        this.columnName = columnName;
+        this.colDataType = colDataType;
+        this.columnSpecs = columnSpecs;
     }
 
-    public void setColumnSpecStrings(List<String> list) {
-        columnSpecStrings = list;
+    public List<String> getColumnSpecs() {
+        return columnSpecs;
+    }
+
+    public void setColumnSpecs(List<String> list) {
+        columnSpecs = list;
     }
 
     public ColDataType getColDataType() {
@@ -45,7 +57,11 @@ public void setColumnName(String string) {
 
     @Override
     public String toString() {
-        return columnName + " " + colDataType + (columnSpecStrings != null ? " " + PlainSelect.
-                getStringList(columnSpecStrings, false, false) : "");
+        return columnName + " " + toStringDataTypeAndSpec();
+    }
+    
+    public String toStringDataTypeAndSpec() {
+        return colDataType + ((columnSpecs != null && !columnSpecs.isEmpty())? " " + PlainSelect.
+                getStringList(columnSpecs, false, false) : "");
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java

@@ -68,8 +68,8 @@ public void deParse(CreateTable createTable) {
                     buffer.append(columnDefinition.getColumnName());
                     buffer.append(" ");
                     buffer.append(columnDefinition.getColDataType().toString());
-                    if (columnDefinition.getColumnSpecStrings() != null) {
-                        for (String s : columnDefinition.getColumnSpecStrings()) {
+                    if (columnDefinition.getColumnSpecs() != null) {
+                        for (String s : columnDefinition.getColumnSpecs()) {
                             buffer.append(" ");
                             buffer.append(s);
                         }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -3675,7 +3675,7 @@ ColumnDefinition ColumnDefinition(): {
         coldef.setColumnName(columnName);
         coldef.setColDataType(colDataType);
         if (columnSpecs.size() > 0)
-            coldef.setColumnSpecStrings(columnSpecs);
+            coldef.setColumnSpecs(columnSpecs);
         return coldef;
     }
 }
@@ -3842,7 +3842,7 @@ CreateTable CreateTable():
                         coldef.setColumnName(columnName);
                         coldef.setColDataType(colDataType);
                         if (columnSpecs.size() > 0)
-                            coldef.setColumnSpecStrings(columnSpecs);
+                            coldef.setColumnSpecs(columnSpecs);
                         columnDefinitions.add(coldef);
                     } */
                     { columnDefinitions.add(coldef); }

src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java

@@ -438,8 +438,8 @@ public void testRUBiSCreateList() throws Exception {
                             }
 
                             if (!unique) {
-                                if (columnDefinition.getColumnSpecStrings() != null) {
-                                    for (Iterator iterator = columnDefinition.getColumnSpecStrings().
+                                if (columnDefinition.getColumnSpecs() != null) {
+                                    for (Iterator iterator = columnDefinition.getColumnSpecs().
                                             iterator(); iterator
                                                     .hasNext();) {
                                         String par = (String) iterator.next();