github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#9354] WIP: Support for ALTER TABLE .. ALTER .. DROP DEFAULT

Browse Source
This commit is contained in:
lukaseder 2019-10-11 21:18:22 +02:00
parent ec506f6ecb
commit 0286bb7e49
3 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
View File

@ -113,6 +113,24 @@ public interface AlterTableAlterStep<T> {
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
AlterTableFinalStep default_(Field<T> expression);
/**
* Specify a new column <code>DEFAULT</code>.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
AlterTableFinalStep setDefault(T literal);
/**
* Specify a new column <code>DEFAULT</code>.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
AlterTableFinalStep setDefault(Field<T> expression);
/**
* Drop the column <code>DEFAULT</code>.
*/
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
AlterTableFinalStep dropDefault();
/**
* Specify a new column data type.
* <p>

48
jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
View File

@ -102,6 +102,7 @@ import static org.jooq.impl.Keywords.K_DEFAULT;
import static org.jooq.impl.Keywords.K_DROP;
import static org.jooq.impl.Keywords.K_DROP_COLUMN;
import static org.jooq.impl.Keywords.K_DROP_CONSTRAINT;
import static org.jooq.impl.Keywords.K_DROP_DEFAULT;
import static org.jooq.impl.Keywords.K_DROP_NOT_NULL;
import static org.jooq.impl.Keywords.K_ELSE;
import static org.jooq.impl.Keywords.K_END_IF;
@ -254,6 +255,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
private Nullability alterColumnNullability;
private DataType<?> alterColumnType;
private Field<?> alterColumnDefault;
private boolean alterColumnDropDefault;
private QueryPartList<Field<?>> dropColumns;
private boolean dropColumnCascade;
private Constraint dropConstraint;
@ -283,6 +285,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
final Nullability $alterColumnNullability() { return alterColumnNullability; }
final DataType<?> $alterColumnType() { return alterColumnType; }
final Field<?> $alterColumnDefault() { return alterColumnDefault; }
final boolean $alterColumnDropDefault() { return alterColumnDropDefault; }
final Table<?> $renameTo() { return renameTo; }
final Field<?> $renameColumn() { return renameColumn; }
final Field<?> $renameColumnTo() { return renameColumnTo; }
@ -627,25 +630,41 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
@Override
public final AlterTableImpl defaultValue(Object literal) {
return default_(literal);
return setDefault(literal);
}
@Override
public final AlterTableImpl defaultValue(Field expression) {
return default_(expression);
return setDefault(expression);
}
@Override
public final AlterTableImpl default_(Object literal) {
return default_(Tools.field(literal));
return setDefault(literal);
}
@Override
public final AlterTableImpl default_(Field expression) {
return setDefault(expression);
}
@Override
public final AlterTableImpl setDefault(Object literal) {
return default_(Tools.field(literal));
}
@Override
public final AlterTableImpl setDefault(Field expression) {
alterColumnDefault = expression;
return this;
}
@Override
public final AlterTableImpl dropDefault() {
alterColumnDropDefault = true;
return this;
}
@Override
public final AlterTableImpl drop(Field<?> field) {
return dropColumn(field);
@ -1266,7 +1285,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
case MYSQL: {
// MySQL's CHANGE COLUMN clause has a mandatory RENAMING syntax...
if (alterColumnDefault == null)
if (alterColumnDefault == null && !alterColumnDropDefault)
ctx.visit(K_CHANGE_COLUMN)
.sql(' ').qualify(false).visit(alterColumn).qualify(true);
else
@ -1345,6 +1364,27 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
ctx.sql(' ').visit(alterColumnDefault)
.end(ALTER_TABLE_ALTER_DEFAULT);
}
else if (alterColumnDropDefault) {
ctx.start(ALTER_TABLE_ALTER_DEFAULT);
switch (family) {
// [#9354] TODO: Research the syntax in the various dialects
// and add integration tests.
default:
ctx.sql(' ').visit(K_DROP_DEFAULT);
break;
}
ctx.end(ALTER_TABLE_ALTER_DEFAULT);
}
else if (alterColumnNullability != null) {
ctx.start(ALTER_TABLE_ALTER_NULL)
.sql(' ').visit(alterColumnNullability.nullable() ? K_DROP_NOT_NULL : K_SET_NOT_NULL)

1
jOOQ/src/main/java/org/jooq/impl/Keywords.java
View File

@ -127,6 +127,7 @@ final class Keywords {
static final Keyword K_DROP = keyword("drop");
static final Keyword K_DROP_COLUMN = keyword("drop column");
static final Keyword K_DROP_CONSTRAINT = keyword("drop constraint");
static final Keyword K_DROP_DEFAULT = keyword("drop default");
static final Keyword K_DROP_INDEX = keyword("drop index");
static final Keyword K_DROP_NOT_NULL = keyword("drop not null");
static final Keyword K_DROP_SCHEMA = keyword("drop schema");