Skip to content

Commit b289ef6

Browse files
committed
Make remaining ALTER key element types explicit
1 parent ee9ab98 commit b289ef6

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,14 @@ private void replaceKeyColumns(List<String> names) {
544544
List<Index.ColumnParams> previous = index.getColumns();
545545
for (int i = 0; i < names.size(); i++) {
546546
String name = names.get(i);
547-
replacement.add(previous != null && i < previous.size()
548-
&& previous.get(i).toString().equals(name) ? previous.get(i)
549-
: new Index.ColumnParams(name));
547+
if (previous != null && i < previous.size()) {
548+
Index.ColumnParams previousColumn = previous.get(i);
549+
if (previousColumn.toString().equals(name)) {
550+
replacement.add(previousColumn);
551+
continue;
552+
}
553+
}
554+
replacement.add(new Index.ColumnParams(name));
550555
}
551556
}
552557
index.setColumns(replacement);
@@ -594,7 +599,8 @@ public void add(int position, String name) {
594599
@Override
595600
public String remove(int position) {
596601
List<Index.ColumnParams> columns = new ArrayList<>(index.getColumns());
597-
String previous = columns.remove(position).toString();
602+
Index.ColumnParams removedColumn = columns.remove(position);
603+
String previous = removedColumn.toString();
598604
index.setColumns(columns);
599605
modCount++;
600606
return previous;

0 commit comments

Comments
 (0)