diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java index fa62b6686f..b050741821 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java @@ -976,6 +976,8 @@ final class AlterTableImpl extends AbstractQuery implements + + case H2: case MARIADB: case POSTGRES: @@ -1078,6 +1080,9 @@ final class AlterTableImpl extends AbstractQuery implements ctx.sql(' ').visit(K_SET_DATA_TYPE); break; + + + case FIREBIRD: case POSTGRES: ctx.sql(' ').visit(K_TYPE); diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java index 691c0f6fb9..eb1849f297 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java @@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.MYSQL; // ... // ... // ... +// ... import static org.jooq.impl.DSL.name; import static org.jooq.impl.DSL.table; import static org.jooq.impl.Keywords.K_DROP_INDEX; diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 68ac1854bd..a3e163823e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -2641,7 +2641,7 @@ final class ParserImpl implements Parser { return Internal.createIndex(name == null ? DSL.name("") : name, table, fields, false); } - private static boolean parseConstraintStateIf(ParserContext ctx) { + private static final boolean parseConstraintStateIf(ParserContext ctx) { parseKeywordIf(ctx, "ENABLE"); return true; } @@ -7183,7 +7183,6 @@ final class ParserImpl implements Parser { if (parseKeywordOrIdentifierIf(ctx, "WITHOUT TIME ZONE") || true) return precision == null ? SQLDataType.TIME : SQLDataType.TIME(precision); } - else if (parseKeywordOrIdentifierIf(ctx, "TINYBLOB")) return SQLDataType.BLOB; else if (parseKeywordOrIdentifierIf(ctx, "TINYINT")) diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java index e26d7ee7a7..c0aaae663c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java @@ -56,6 +56,7 @@ import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.POSTGRES_10; // ... // ... +// ... import static org.jooq.conf.SettingsTools.getExecuteUpdateWithoutWhere; import static org.jooq.impl.DSL.select; import static org.jooq.impl.Keywords.K_FROM; @@ -459,9 +460,8 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl @Override public final void addFrom(Collection> f) { - for (TableLike provider : f) { + for (TableLike provider : f) from.add(provider.asTable()); - } } @Override @@ -635,16 +635,16 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl + default: ctx.start(UPDATE_FROM); - if (!from.isEmpty()) { + if (!from.isEmpty()) ctx.formatSeparator() .visit(K_FROM).sql(' ') .declareTables(true) .visit(from) .declareTables(false); - } ctx.end(UPDATE_FROM); break;