Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,8 @@ public ColumnDataType(

@Override
public String toString() {
return getColumnName() + (withType ? " TYPE " : " ") + toStringDataTypeAndSpec();
return getColumnName() + (withType ? " TYPE " : getColDataType() == null ? "" : " ")
+ toStringDataTypeAndSpec();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 6 additions & 4 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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); } ]
Expand Down Expand Up @@ -6433,8 +6437,6 @@ AlterExpression AlterExpression():
)
)
)
|
( sk3=RelObjectName() <K_COMMENT> tk=<S_CHAR_LITERAL> { alterExp.withColumnName(sk3).withCommentText(tk.image); } )
)
)
|
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down