diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java index ff8de6f712..f513335f32 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java @@ -229,6 +229,22 @@ public interface AlterTableStep { @Support AlterTableFinalStep add(Field field); + /** + * Add an ADD clause with multiple columns or constraints to + * the ALTER TABLE statement. + */ + // @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES }) + @Support({ H2 }) + AlterTableFinalStep add(FieldOrConstraint... fields); + + /** + * Add an ADD clause with multiple columns or constraints to + * the ALTER TABLE statement. + */ + // @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES }) + @Support({ H2 }) + AlterTableFinalStep add(Collection fields); + /** * Add an ADD COLUMN clause to the ALTER TABLE * statement. diff --git a/jOOQ/src/main/java/org/jooq/Constraint.java b/jOOQ/src/main/java/org/jooq/Constraint.java index d3dedac65f..7707c2731a 100644 --- a/jOOQ/src/main/java/org/jooq/Constraint.java +++ b/jOOQ/src/main/java/org/jooq/Constraint.java @@ -42,6 +42,6 @@ package org.jooq; * * @author Lukas Eder */ -public interface Constraint extends QueryPart { +public interface Constraint extends FieldOrConstraint { } diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index b78151826d..87b2bab356 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -79,7 +79,14 @@ import org.jooq.types.Interval; * @param The field type * @author Lukas Eder */ -public interface Field extends SelectField, GroupField, OrderField, FieldOrRow, Named { +public interface Field +extends + SelectField, + GroupField, + OrderField, + FieldOrRow, + FieldOrConstraint, + Named { // ------------------------------------------------------------------------ // API diff --git a/jOOQ/src/main/java/org/jooq/FieldOrConstraint.java b/jOOQ/src/main/java/org/jooq/FieldOrConstraint.java new file mode 100644 index 0000000000..0e435da934 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/FieldOrConstraint.java @@ -0,0 +1,50 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: http://www.jooq.org/licenses + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq; + +/** + * A common base type for {@link Field} and {@link Constraint} where DSL API accepts + * both types alike. + *

+ * This is useful for DDL statements. + * + * @author Lukas Eder + */ +public interface FieldOrConstraint extends QueryPart { + +} diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java index bf390317de..35341466b1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java @@ -144,6 +144,7 @@ import org.jooq.Context; import org.jooq.DSLContext; import org.jooq.DataType; import org.jooq.Field; +import org.jooq.FieldOrConstraint; import org.jooq.Index; import org.jooq.Name; import org.jooq.Nullability; @@ -192,6 +193,7 @@ final class AlterTableImpl extends AbstractQuery implements private Index renameIndexTo; private Constraint renameConstraint; private Constraint renameConstraintTo; + private QueryPartList add; private Field addColumn; private DataType addColumnType; private Constraint addConstraint; @@ -349,6 +351,17 @@ final class AlterTableImpl extends AbstractQuery implements return addColumn(field); } + @Override + public final AlterTableImpl add(FieldOrConstraint... fields) { + return add(Arrays.asList(fields)); + } + + @Override + public final AlterTableImpl add(Collection fields) { + add = new QueryPartList(fields); + return this; + } + @Override public final AlterTableImpl add(Field field, DataType type) { return addColumn(field, type); @@ -867,6 +880,41 @@ final class AlterTableImpl extends AbstractQuery implements ctx.data().remove(DATA_CONSTRAINT_REFERENCE); ctx.end(ALTER_TABLE_RENAME_CONSTRAINT); } + else if (add != null) { + boolean qualify = ctx.qualify(); + + ctx.start(ALTER_TABLE_ADD) + .visit(K_ADD) + .qualify(false) + .sql(" ("); + + boolean indent = add.size() > 1; + + if (indent) + ctx.formatIndentStart() + .formatNewLine(); + + for (int i = 0; i < add.size(); i++) { + if (i > 0) + ctx.sql(',').formatSeparator(); + + FieldOrConstraint part = add.get(i); + ctx.visit(part); + + if (part instanceof Field) { + ctx.sql(' '); + toSQLDDLTypeDeclarationForAddition(ctx, ((Field) part).getDataType()); + } + } + + if (indent) + ctx.formatIndentEnd() + .formatNewLine(); + + ctx.sql(')') + .qualify(qualify) + .end(ALTER_TABLE_ADD); + } else if (addColumn != null) { boolean qualify = ctx.qualify();