Skip to content

Fix ALTER TABLE with a USING INDEX clause #2384

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 1 commit into from
Feb 23, 2026
+54 −17
Merged

Fix ALTER TABLE with a USING INDEX clause #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 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 @@ -9195,7 +9195,11 @@ AlterExpression AlterExpression():
LOOKAHEAD(2) (<K_PRIMARY> <K_KEY> columnNames=ColumnsNamesList() { alterExp.setPkColumns(columnNames); })

constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
[<K_USING> sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }]
[
<K_USING> { alterExp.addParameters("USING"); }
[ <K_INDEX> { alterExp.addParameters("INDEX"); } ]
sk4=RelObjectName() { alterExp.addParameters(sk4); }
]
|
LOOKAHEAD(2) (
(tk=<K_KEY> { alterExp.setUk(true); } | tk=<K_INDEX>)
Expand Down Expand Up @@ -9324,7 +9328,11 @@ AlterExpression AlterExpression():
|
( <K_UNIQUE> ((<K_KEY> { alterExp.setUk(true); } | <K_INDEX>) (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { alterExp.setUkName(tk.image); } )?
columnNames=ColumnsNamesList() { alterExp.setUkColumns(columnNames); }
[ <K_USING> sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }]
[
<K_USING> { alterExp.addParameters("USING"); }
[ <K_INDEX> { alterExp.addParameters("INDEX"); } ]
sk4=RelObjectName() { alterExp.addParameters(sk4); }
]
[ LOOKAHEAD(2) index = IndexWithComment(index) { alterExp.setIndex(index); } ]
)
|
Expand Down Expand Up @@ -9414,7 +9422,11 @@ AlterExpression AlterExpression():
alterExp.setIndex(index);
}
constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
[ <K_USING> sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }]
[
<K_USING> { alterExp.addParameters("USING"); }
[ <K_INDEX> { alterExp.addParameters("INDEX"); } ]
sk4=RelObjectName() { alterExp.addParameters(sk4); }
]
[ LOOKAHEAD(2) index = IndexWithComment(index) { alterExp.setIndex(index); } ]
)
|
Expand Down Expand Up @@ -9446,7 +9458,11 @@ AlterExpression AlterExpression():
alterExp.setIndex(index);
}
constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
[ <K_USING> sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }]
[
<K_USING> { alterExp.addParameters("USING"); }
[ <K_INDEX> { alterExp.addParameters("INDEX"); } ]
sk4=RelObjectName() { alterExp.addParameters(sk4); }
]
[ LOOKAHEAD(2) index = IndexWithComment(index) { alterExp.setIndex(index); } ]
)
|
Expand Down
47 changes: 34 additions & 13 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 @@ -9,22 +9,21 @@
*/
package net.sf.jsqlparser.statement.alter;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;

import static net.sf.jsqlparser.test.TestUtils.assertDeparse;
import static net.sf.jsqlparser.test.TestUtils.assertEqualsObjectTree;
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
import static net.sf.jsqlparser.test.TestUtils.assertStatementCanBeDeparsedAs;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.StringValue;
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
Expand All @@ -43,10 +42,10 @@
import net.sf.jsqlparser.statement.create.table.Index.ColumnParams;
import net.sf.jsqlparser.statement.create.table.NamedConstraint;
import net.sf.jsqlparser.statement.create.table.PartitionDefinition;
import static net.sf.jsqlparser.test.TestUtils.assertDeparse;
import static net.sf.jsqlparser.test.TestUtils.assertEqualsObjectTree;
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
import static net.sf.jsqlparser.test.TestUtils.assertStatementCanBeDeparsedAs;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class AlterTest {

Expand Down Expand Up @@ -2234,4 +2233,26 @@ public void testAlterTableAddIndexInvisible() throws JSQLParserException {

assertSqlCanBeParsedAndDeparsed(sql);
}

@Test
public void testAlterTableAddConstraintPrimaryKeyUsingIndexName() throws JSQLParserException {
String sql =
"ALTER TABLE TNWAV ADD CONSTRAINT PK_TNWAV PRIMARY KEY (NWNAME, ZEILE, BESTGRU) USING INDEX PK_TNWAV";
Statement stmt = CCJSqlParserUtil.parse(sql);
assertInstanceOf(Alter.class, stmt);

Alter alter = (Alter) stmt;
assertEquals("TNWAV", alter.getTable().getFullyQualifiedName());

List<AlterExpression> alterExpressions = alter.getAlterExpressions();
assertNotNull(alterExpressions);
assertEquals(1, alterExpressions.size());

AlterExpression alterExp = alterExpressions.get(0);
assertEquals(AlterOperation.ADD, alterExp.getOperation());
assertNotNull(alterExp.getIndex());
assertEquals(Arrays.asList("USING", "INDEX", "PK_TNWAV"), alterExp.getParameters());

assertSqlCanBeParsedAndDeparsed(sql);
}
}