Support SQL Server ALTER TABLE ADD DEFAULT constraints by minleejae · Pull Request #2561 · JSQLParser/JSqlParser · GitHub
Skip to content
Open
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 @@ -24,7 +24,7 @@
public class Index implements TableElement, Serializable {

public enum Kind {
PRIMARY_KEY, UNIQUE, INDEX, FULLTEXT, SPATIAL, FOREIGN_KEY, CHECK, EXCLUDE, OTHER
PRIMARY_KEY, UNIQUE, INDEX, FULLTEXT, SPATIAL, FOREIGN_KEY, CHECK, EXCLUDE, DEFAULT, OTHER
}

private final List<String> name = new ArrayList<>();
Expand Down Expand Up @@ -196,6 +196,8 @@ public void setType(String string) {
kind = Kind.CHECK;
} else if (normalized.startsWith("EXCLUDE")) {
kind = Kind.EXCLUDE;
} else if (normalized.equals("DEFAULT")) {
kind = Kind.DEFAULT;
} else if (normalized.contains("INDEX") || normalized.contains("KEY")) {
kind = Kind.INDEX;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
import net.sf.jsqlparser.statement.create.table.ColumnOption;
import net.sf.jsqlparser.statement.create.table.CreateTable;
import net.sf.jsqlparser.statement.create.table.DefaultConstraint;
import net.sf.jsqlparser.statement.create.table.ExcludeConstraint;
import net.sf.jsqlparser.statement.create.table.ForeignKeyIndex;
import net.sf.jsqlparser.statement.create.table.Index;
Expand Down Expand Up @@ -75,6 +76,11 @@ public static void visit(TableElement element, Consumer<Expression> expressions,
if (index instanceof CheckConstraint) {
accept(((CheckConstraint) index).getExpression(), expressions);
}
if (index instanceof DefaultConstraint) {
DefaultConstraint constraint = (DefaultConstraint) index;
accept(constraint.getExpression(), expressions);
accept(constraint.getColumn(), expressions);
}
if (index instanceof ExcludeConstraint) {
accept(((ExcludeConstraint) index).getExpression(), expressions);
}
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/net/sf/jsqlparser/util/deparser/AlterDeParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.sf.jsqlparser.statement.alter.Alter;
import net.sf.jsqlparser.expression.ExpressionVisitor;
import net.sf.jsqlparser.statement.alter.AlterExpression;
import net.sf.jsqlparser.statement.create.table.DefaultConstraint;
import net.sf.jsqlparser.statement.select.PlainSelect;
import java.util.Iterator;

Expand Down Expand Up @@ -47,6 +48,12 @@ public void deParse(Alter alter) {
}

private void deParseAction(AlterExpression action) {
if (action.getIndex() instanceof DefaultConstraint) {
builder.append(action.getOperation()).append(' ');
new TableElementDeParser(builder, expressionVisitor).deParse(action.getIndex());
deParseTail(action);
return;
}
if (action.getColDataTypeList() == null || action.getColDataTypeList().size() != 1
|| action.getColDataTypeList().get(0).getUsingExpression() == null) {
builder.append(action);
Expand All @@ -63,10 +70,17 @@ private void deParseAction(AlterExpression action) {
builder.append(column.getColumnName()).append(column.isWithType() ? " TYPE " : " ")
.append(column.toStringDataTypeAndSpec()).append(" USING ");
column.getUsingExpression().accept(expressionVisitor, null);
deParseTail(action);
}

private void deParseTail(AlterExpression action) {
if (action.getParameters() != null && !action.getParameters().isEmpty()) {
builder.append(' ')
.append(PlainSelect.getStringList(action.getParameters(), false, false));
}
if (action.getIndex() != null && action.getIndex().getCommentText() != null) {
builder.append(" COMMENT ").append(action.getIndex().getCommentText());
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import net.sf.jsqlparser.statement.create.table.CheckConstraint;
import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
import net.sf.jsqlparser.statement.create.table.ColumnOption;
import net.sf.jsqlparser.statement.create.table.DefaultConstraint;
import net.sf.jsqlparser.statement.create.table.ExcludeConstraint;
import net.sf.jsqlparser.statement.create.table.Index;
import net.sf.jsqlparser.statement.create.table.TableElement;
Expand All @@ -30,7 +31,10 @@ public TableElementDeParser(StringBuilder builder,

@Override
public void deParse(TableElement element) {
if (element instanceof ExcludeConstraint) {
if (element instanceof DefaultConstraint) {
((DefaultConstraint) element).appendTo(builder,
expression -> expression.accept(expressionVisitor, null));
} else if (element instanceof ExcludeConstraint) {
deParseExclude((ExcludeConstraint) element);
} else if (element instanceof CheckConstraint) {
deParseCheck((CheckConstraint) element);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import net.sf.jsqlparser.statement.alter.AlterExpression.ColumnDropNotNull;
import net.sf.jsqlparser.statement.alter.AlterExpression.ColumnSetNotNull;
import net.sf.jsqlparser.statement.alter.AlterOperation;
import net.sf.jsqlparser.statement.create.table.DefaultConstraint;
import net.sf.jsqlparser.util.TableDefinitionTraversal;
import net.sf.jsqlparser.util.validation.ValidationCapability;
import net.sf.jsqlparser.util.validation.ValidationUtil;
Expand Down Expand Up @@ -87,7 +88,10 @@ public void validate(Alter alter, AlterExpression e) {
validateOptionalColumnNames(c, e.getUkColumns(), NamedObject.uniqueConstraint);
}

if (e.getIndex() != null) {
if (e.getIndex() instanceof DefaultConstraint) {
validateOptionalName(c, NamedObject.constraint, e.getIndex().getName(), null, false,
NamedObject.table);
} else if (e.getIndex() != null) {
validateName(c, NamedObject.index, e.getIndex().getName());
if (e.getIndex().getColumns() != null) {
validateOptionalColumnNames(c,
Expand Down
24 changes: 24 additions & 0 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Loading
Loading