Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manticore-projects merged 2 commits into from
Feb 8, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03b54d
fix: Fixes parsing failing for ALTER MODIFY queries not containing da…
Tanish0019 Feb 7, 2024
4f10cf5
fixed spotcheck formatting issues
Tanish0019 Feb 8, 2024
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
Prev Previous commit
fixed spotcheck formatting issues
  • Loading branch information
@Tanish0019
Tanish0019 committed Feb 8, 2024
commit 4f10cf56e5127239495b99071aa436e7e97a9a9f
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ public ColumnDataType(
@Override
public String toString() {
return getColumnName() + (withType ? " TYPE " : getColDataType() == null ? "" : " ")
+ toStringDataTypeAndSpec();
+ toStringDataTypeAndSpec();
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ public String toString() {
}

public String toStringDataTypeAndSpec() {
return (colDataType == null ? "" : 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
3 changes: 1 addition & 2 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6273,8 +6273,7 @@ AlterExpression AlterExpression():
)

(
LOOKAHEAD(2)
(<K_PRIMARY> <K_KEY> columnNames=ColumnsNamesList() { alterExp.setPkColumns(columnNames); })
LOOKAHEAD(2) (<K_PRIMARY> <K_KEY> columnNames=ColumnsNamesList() { alterExp.setPkColumns(columnNames); })

constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
[<K_USING> sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }]
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ public void testAlterTableModifyColumn2() throws JSQLParserException {
@Test
public void testAlterTableModifyColumn3() throws JSQLParserException {
Alter alter =
(Alter) CCJSqlParserUtil.parse("ALTER TABLE mytable modify col1 NULL");
(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
Expand All @@ -377,7 +377,7 @@ public void testAlterTableModifyColumn3() throws JSQLParserException {
@Test
public void testAlterTableModifyColumn4() throws JSQLParserException {
Alter alter =
(Alter) CCJSqlParserUtil.parse("ALTER TABLE mytable modify col1 DEFAULT 0");
(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
Expand Down