Support Alter Table Alter Column Type (#724)

Author: rfscholte

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

@@ -110,7 +110,7 @@ public List<ColumnDataType> getColDataTypeList() {
     }
 
     public void addColDataType(String columnName, ColDataType colDataType) {
-        addColDataType(new ColumnDataType(columnName, colDataType, null));
+        addColDataType(new ColumnDataType(columnName, false, colDataType, null));
     }
 
     public void addColDataType(ColumnDataType columnDataType) {
@@ -248,11 +248,13 @@ public String toString() {
     public static class ColumnDataType {
 
         private final String columnName;
+        private final boolean withType;
         private final ColDataType colDataType;
         private final List<String> columnSpecs;
 
-        public ColumnDataType(String columnName, ColDataType colDataType, List<String> columnSpecs) {
+        public ColumnDataType(String columnName, boolean withType, ColDataType colDataType, List<String> columnSpecs) {
             this.columnName = columnName;
+            this.withType = withType;
             this.colDataType = colDataType;
             this.columnSpecs = columnSpecs;
         }
@@ -274,7 +276,7 @@ public List<String> getColumnSpecs() {
 
         @Override
         public String toString() {
-            return columnName + " " + colDataType + parametersToString();
+            return columnName + ( withType ? " TYPE " : " " ) + colDataType + parametersToString();
         }
 
         private String parametersToString() {

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

@@ -26,5 +26,5 @@
  * @author toben
  */
 public enum AlterOperation {
-    ADD, DROP, MODIFY, CHANGE;
+    ADD, ALTER, DROP, MODIFY, CHANGE;
 }

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

@@ -282,6 +282,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_TOP:"TOP">
 |   <K_TRAILING:"TRAILING">
 |   <K_TRUNCATE:"TRUNCATE">
+|   <K_TYPE:"TYPE">
 |   <K_UNBOUNDED: "UNBOUNDED"> 
 |   <K_UNION:"UNION">
 |   <K_UNIQUE:"UNIQUE">
@@ -1049,7 +1050,7 @@ String RelObjectNameWithoutValue() :
       | tk=<K_TABLE> | tk=<K_DATETIMELITERAL> | tk=<K_COMMIT> | tk=<K_PRECISION>
       | tk=<K_INSERT> | tk=<K_INDEX> | tk=<K_PRIMARY> | tk=<K_ENABLE>
 	  | tk=<K_UNSIGNED>
-      | tk=<K_TEMP> | tk=<K_TEMPORARY> | tk=<K_ISNULL> 
+      | tk=<K_TEMP> | tk=<K_TEMPORARY> | tk=<K_TYPE> | tk=<K_ISNULL> 
 	  | tk=<K_ZONE>
 /*      | tk=<K_PLACING> | tk=<K_BOTH> | tk=<K_LEADING> | tk=<K_TRAILING> */
       )
@@ -3567,6 +3568,8 @@ List<String> CreateParameter():
             tk=<K_BY> { param.add(tk.image); }
 			|
             tk=<K_IN> { param.add(tk.image); }
+			|
+            tk=<K_TYPE> { param.add(tk.image); }
         )
     {return param;}
 }
@@ -3596,7 +3599,7 @@ String ColumnsNamesListItem():
     String item = null;
 } 
 {
-	(tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { item = tk.image; }
+	( item = RelObjectName() )
 	[ "(" tk = <S_LONG>  ")" { item = item + "(" + tk.image + ")"; } ]
 	{
 		return item;
@@ -3668,16 +3671,18 @@ Truncate Truncate():
 AlterExpression.ColumnDataType AlterExpressionColumnDataType():
 {
     String columnName = null;
+    boolean withType = false;
     ColDataType dataType = null;
     List<String> columnSpecs = null;
     List<String> parameter = null;
 }
 {
     columnName = RelObjectName()
+    (<K_TYPE> { withType = true; } )?
     dataType = ColDataType() { columnSpecs = new ArrayList(); }
     ( parameter = CreateParameter() { columnSpecs.addAll(parameter); } )*
     {
-        return new AlterExpression.ColumnDataType(columnName, dataType, columnSpecs);
+        return new AlterExpression.ColumnDataType(columnName, withType, dataType, columnSpecs);
     }
 }
 
@@ -3735,7 +3740,7 @@ AlterExpression AlterExpression():
 {
 
     (
-    ((<K_ADD>    { alterExp.setOperation(AlterOperation.ADD); } | <K_MODIFY> { alterExp.setOperation(AlterOperation.MODIFY); })
+    ((<K_ADD>    { alterExp.setOperation(AlterOperation.ADD); } | <K_ALTER>    { alterExp.setOperation(AlterOperation.ALTER); } | <K_MODIFY> { alterExp.setOperation(AlterOperation.MODIFY); })
       (
 		LOOKAHEAD(2) ( <K_PRIMARY> <K_KEY> columnNames=ColumnsNamesList() { alterExp.setPkColumns(columnNames); } ) constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
 		|

src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java

@@ -245,6 +245,12 @@ public void testAlterTableModifyColumn2() throws JSQLParserException {
         assertEquals(AlterOperation.MODIFY, ((Alter) stmt).getAlterExpressions().get(0).
                 getOperation());
     }
+    
+    @Test
+    public void testAlterTableAlterColumn() throws JSQLParserException {
+      // http://www.postgresqltutorial.com/postgresql-change-column-type/
+      assertSqlCanBeParsedAndDeparsed("ALTER TABLE table_name ALTER COLUMN column_name_1 TYPE TIMESTAMP, ALTER COLUMN column_name_2 TYPE BOOLEAN");
+    }
 
     @Test
     public void testAlterTableAddColumnWithZone() throws JSQLParserException {