fix: Fixes parsing failing for ALTER MODIFY queries not containing datatype (#1961)

* fix: Fixes parsing failing for ALTER MODIFY queries not containing datatype

* fixed spotcheck formatting issues

Author: Tanish0019

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

@@ -773,7 +773,8 @@ public ColumnDataType(
 
         @Override
         public String toString() {
-            return getColumnName() + (withType ? " TYPE " : " ") + toStringDataTypeAndSpec();
+            return getColumnName() + (withType ? " TYPE " : getColDataType() == null ? "" : " ")
+                    + toStringDataTypeAndSpec();
         }
 
         @Override

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

@@ -69,9 +69,10 @@ public String toString() {
     }
 
     public String toStringDataTypeAndSpec() {
-        return colDataType + (columnSpecs != null && !columnSpecs.isEmpty()
-                ? " " + PlainSelect.getStringList(columnSpecs, false, false)
-                : "");
+        return (colDataType == null ? "" : colDataType)
+                + (columnSpecs != null && !columnSpecs.isEmpty()
+                        ? " " + PlainSelect.getStringList(columnSpecs, false, false)
+                        : "");
     }
 
     public ColumnDefinition withColumnName(String columnName) {

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

@@ -6144,9 +6144,9 @@ AlterExpression.ColumnDataType AlterExpressionColumnDataType():
     List<String> parameter = null;
 }
 {
-    columnName = RelObjectName()
+    columnName = RelObjectName() { columnSpecs = new ArrayList<String>(); }
     ( LOOKAHEAD(2) <K_TYPE> { withType = true; } )?
-    dataType = ColDataType() { columnSpecs = new ArrayList<String>(); }
+    ( LOOKAHEAD(2) dataType = ColDataType() )?
     ( parameter = CreateParameter() { columnSpecs.addAll(parameter); } )*
     {
         return new AlterExpression.ColumnDataType(columnName, withType, dataType, columnSpecs);
@@ -6291,6 +6291,10 @@ AlterExpression AlterExpression():
                   [ index = IndexWithComment(index) { alterExp.setIndex(index); } ]
                 )
                 |
+                LOOKAHEAD(2) (
+                  sk3=RelObjectName() <K_COMMENT> tk=<S_CHAR_LITERAL> { alterExp.withColumnName(sk3).withCommentText(tk.image); }
+                )
+                |
                 LOOKAHEAD(3) (
                     ( LOOKAHEAD(2) <K_COLUMN> { alterExp.hasColumn(true); } )?
                     [ <K_IF> <K_NOT> <K_EXISTS> { alterExp.setUseIfNotExists(true); } ]
@@ -6433,8 +6437,6 @@ AlterExpression AlterExpression():
                     )
                    )
                 )
-                |
-                ( sk3=RelObjectName() <K_COMMENT> tk=<S_CHAR_LITERAL> { alterExp.withColumnName(sk3).withCommentText(tk.image); } )
               )
       )
       |

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

@@ -360,6 +360,34 @@ public void testAlterTableModifyColumn2() throws JSQLParserException {
         assertFalse(alterExpression.hasColumn());
     }
 
+    @Test
+    public void testAlterTableModifyColumn3() throws JSQLParserException {
+        Alter alter =
+                (Alter) CCJSqlParserUtil.parse("ALTER TABLE mytable modify col1 NULL");
+        AlterExpression alterExpression = alter.getAlterExpressions().get(0);
+
+        // COLUMN keyword DOES NOT appear in deparsed statement, modify becomes all caps
+        assertStatementCanBeDeparsedAs(alter, "ALTER TABLE mytable MODIFY col1 NULL");
+
+        assertEquals(AlterOperation.MODIFY, alterExpression.getOperation());
+
+        assertFalse(alterExpression.hasColumn());
+    }
+
+    @Test
+    public void testAlterTableModifyColumn4() throws JSQLParserException {
+        Alter alter =
+                (Alter) CCJSqlParserUtil.parse("ALTER TABLE mytable modify col1 DEFAULT 0");
+        AlterExpression alterExpression = alter.getAlterExpressions().get(0);
+
+        // COLUMN keyword DOES NOT appear in deparsed statement, modify becomes all caps
+        assertStatementCanBeDeparsedAs(alter, "ALTER TABLE mytable MODIFY col1 DEFAULT 0");
+
+        assertEquals(AlterOperation.MODIFY, alterExpression.getOperation());
+
+        assertFalse(alterExpression.hasColumn());
+    }
+
     @Test
     public void testAlterTableAlterColumn() throws JSQLParserException {
         // http://www.postgresqltutorial.com/postgresql-change-column-type/