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

[#7044] Add support for ALTER TABLE .. COMMENT

Browse Source
This commit is contained in:
lukaseder 2018-01-12 15:15:30 +01:00
parent 646dadec10
commit 247c8b2dcd
4 changed files with 58 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/AlterTableStep.java
View File

@ -70,6 +70,24 @@ import org.jooq.impl.DSL;
*/
public interface AlterTableStep {
/**
* Specify a comment for a table using MySQL's syntax.
*
* @see DSL#commentOnTable(Table)
* @see DSLContext#commentOnTable(Table)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
AlterTableFinalStep comment(String comment);
/**
* Specify a comment for a table using MySQL's syntax.
*
* @see DSL#commentOnTable(Table)
* @see DSLContext#commentOnTable(Table)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
AlterTableFinalStep comment(Comment comment);
/**
* Add a <code>RENAME TO</code> clause to the <code>ALTER TABLE</code>
* statement.

3
jOOQ/src/main/java/org/jooq/DSLContext.java
View File

@ -8440,6 +8440,7 @@ public interface DSLContext extends Scope , AutoCloseable {
* Create a new DSL <code>COMMENT ON TABLE</code> statement.
*
* @see DSL#commentOnTable(String)
* @see AlterTableStep#comment(Comment)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
CommentOnIsStep commentOnTable(String tableName);
@ -8448,6 +8449,7 @@ public interface DSLContext extends Scope , AutoCloseable {
* Create a new DSL <code>COMMENT ON TABLE</code> statement.
*
* @see DSL#commentOnTable(Name)
* @see AlterTableStep#comment(Comment)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
CommentOnIsStep commentOnTable(Name tableName);
@ -8456,6 +8458,7 @@ public interface DSLContext extends Scope , AutoCloseable {
* Create a new DSL <code>COMMENT ON TABLE</code> statement.
*
* @see DSL#commentOnTable(Table)
* @see AlterTableStep#comment(Comment)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
CommentOnIsStep commentOnTable(Table<?> table);

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

@ -65,6 +65,7 @@ import static org.jooq.SQLDialect.MYSQL;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
import static org.jooq.impl.DSL.commentOnTable;
import static org.jooq.impl.DSL.constraint;
import static org.jooq.impl.DSL.field;
import static org.jooq.impl.DSL.index;
@ -78,6 +79,7 @@ import static org.jooq.impl.Keywords.K_ALTER_CONSTRAINT;
import static org.jooq.impl.Keywords.K_ALTER_TABLE;
import static org.jooq.impl.Keywords.K_CASCADE;
import static org.jooq.impl.Keywords.K_CHANGE_COLUMN;
import static org.jooq.impl.Keywords.K_COMMENT;
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;
@ -134,6 +136,7 @@ import org.jooq.AlterTableRenameIndexToStep;
import org.jooq.AlterTableStep;
import org.jooq.AlterTableUsingIndexStep;
import org.jooq.Clause;
import org.jooq.Comment;
import org.jooq.Configuration;
import org.jooq.Constraint;
import org.jooq.Context;
@ -180,6 +183,7 @@ final class AlterTableImpl extends AbstractQuery implements
private final boolean ifExists;
private boolean ifExistsColumn;
private boolean ifNotExistsColumn;
private Comment comment;
private Table<?> renameTo;
private Field<?> renameColumn;
private Field<?> renameColumnTo;
@ -216,6 +220,17 @@ final class AlterTableImpl extends AbstractQuery implements
// XXX: DSL API
// ------------------------------------------------------------------------
@Override
public final AlterTableImpl comment(String c) {
return comment(DSL.comment(c));
}
@Override
public final AlterTableImpl comment(Comment c) {
this.comment = c;
return this;
}
@Override
public final AlterTableImpl renameTo(Table<?> newName) {
this.renameTo = newName;
@ -651,6 +666,18 @@ final class AlterTableImpl extends AbstractQuery implements
private final void accept0(Context<?> ctx) {
SQLDialect family = ctx.family();
if (comment != null) {
switch (family) {
case MARIADB:
case MYSQL:
break;
default:
ctx.visit(commentOnTable(table).is(comment));
return;
}
}
@ -710,9 +737,9 @@ final class AlterTableImpl extends AbstractQuery implements
SQLDialect family = ctx.family();
boolean omitAlterTable =
(family == HSQLDB && renameConstraint != null)
|| (family == DERBY && renameColumn != null);
boolean renameTable = SUPPORT_RENAME_TABLE.contains(family) && renameTo != null;
(renameConstraint != null && family == HSQLDB)
|| (renameColumn != null && family == DERBY);
boolean renameTable = renameTo != null && SUPPORT_RENAME_TABLE.contains(family);
if (!omitAlterTable) {
ctx.start(ALTER_TABLE_TABLE)
@ -727,7 +754,10 @@ final class AlterTableImpl extends AbstractQuery implements
.formatSeparator();
}
if (renameTo != null) {
if (comment != null) {
ctx.visit(K_COMMENT).sql(' ').visit(comment);
}
else if (renameTo != null) {
boolean qualify = ctx.qualify();
ctx.start(ALTER_TABLE_RENAME)

3
jOOQ/src/main/java/org/jooq/impl/DSL.java
View File

@ -5827,6 +5827,7 @@ public class DSL {
* Create a new DSL <code>COMMENT ON TABLE</code> statement.
*
* @see DSLContext#commentOnTable(String)
* @see AlterTableStep#comment(Comment)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
public static CommentOnIsStep commentOnTable(String tableName) {
@ -5837,6 +5838,7 @@ public class DSL {
* Create a new DSL <code>COMMENT ON TABLE</code> statement.
*
* @see DSLContext#commentOnTable(Name)
* @see AlterTableStep#comment(Comment)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
public static CommentOnIsStep commentOnTable(Name tableName) {
@ -5847,6 +5849,7 @@ public class DSL {
* Create a new DSL <code>COMMENT ON TABLE</code> statement.
*
* @see DSLContext#commentOnTable(Table)
* @see AlterTableStep#comment(Comment)
*/
@Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
public static CommentOnIsStep commentOnTable(Table<?> table) {