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

[#6485] [#6969] Supported Firebird ALTER TABLE .. ALTER col TO newname syntax

Browse Source
This commit is contained in:
lukaseder 2017-12-29 17:01:02 +01:00
parent 5b463f7f7c
commit 66f2ed3946
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
View File

@ -64,6 +64,7 @@ alterTableStatement = 'ALTER TABLE' [ 'IF EXISTS' ] tableName break
(
dataType [ [ 'NOT' ] 'NULL' ]
| ( 'SET' | 'DROP' ) 'NOT NULL'
| [ 'RENAME' ] 'TO' identifier
)
| 'DROP' [ 'COLUMN' ] identifier [ 'CASCADE' | 'RESTRICT' ]
| 'DROP CONSTRAINT' constraintName

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

@ -692,7 +692,7 @@ public interface DSLContext extends Scope , AutoCloseable {
*
* @see DSL#begin(Statement...)
*/
@Support({ POSTGRES })
@Support({ FIREBIRD, POSTGRES })
Block begin(Statement... statements);
/**
@ -700,7 +700,7 @@ public interface DSLContext extends Scope , AutoCloseable {
*
* @see DSL#begin(Collection)
*/
@Support({ POSTGRES })
@Support({ FIREBIRD, POSTGRES })
Block begin(Collection<? extends Statement> statements);
// -------------------------------------------------------------------------

31
jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
View File

@ -38,12 +38,16 @@
package org.jooq.impl;
// ...
import static org.jooq.SQLDialect.FIREBIRD;
// ...
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.impl.Keywords.K_AS;
import static org.jooq.impl.Keywords.K_BEGIN;
import static org.jooq.impl.Keywords.K_DO;
import static org.jooq.impl.Keywords.K_END;
import static org.jooq.impl.Keywords.K_EXECUTE_BLOCK;
import static org.jooq.impl.Keywords.K_EXECUTE_IMMEDIATE;
import static org.jooq.impl.Keywords.K_EXECUTE_STATEMENT;
import static org.jooq.impl.Keywords.K_NULL;
import static org.jooq.impl.Tools.decrement;
import static org.jooq.impl.Tools.increment;
@ -70,10 +74,7 @@ final class BlockImpl extends AbstractQuery implements Block {
* Generated UID
*/
private static final long serialVersionUID = 6881305779639901498L;
private static final EnumSet<SQLDialect> REQUIRES_EXECUTE_IMMEDIATE_ON_DDL = EnumSet.of(FIREBIRD);
private final Collection<? extends Statement> statements;
@ -86,6 +87,20 @@ final class BlockImpl extends AbstractQuery implements Block {
@Override
public final void accept(Context<?> ctx) {
switch (ctx.family()) {
case FIREBIRD: {
if (increment(ctx.data(), DATA_BLOCK_NESTING)) {
ctx.paramType(INLINED)
.visit(K_EXECUTE_BLOCK).sql(' ').visit(K_AS).sql(' ')
.formatSeparator();
ctx.data(DATA_FORCE_STATIC_STATEMENT, true);
}
accept0(ctx);
decrement(ctx.data(), DATA_BLOCK_NESTING);
break;
}
case POSTGRES: {
if (increment(ctx.data(), DATA_BLOCK_NESTING)) {
ctx.paramType(INLINED)
@ -131,6 +146,9 @@ final class BlockImpl extends AbstractQuery implements Block {
if (statements.isEmpty()) {
switch (ctx.family()) {
case FIREBIRD:
break;
@ -152,6 +170,8 @@ final class BlockImpl extends AbstractQuery implements Block {
ctx.visit(query);
@ -169,6 +189,9 @@ final class BlockImpl extends AbstractQuery implements Block {
.visit(K_END);
switch (ctx.family()) {
case FIREBIRD:
break;

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

@ -9269,7 +9269,7 @@ public class DSL {
*
* @see DSLContext#begin(Statement...)
*/
@Support({ POSTGRES })
@Support({ FIREBIRD, POSTGRES })
public static Block begin(Statement... statements) {
return begin(Arrays.asList(statements));
}
@ -9279,7 +9279,7 @@ public class DSL {
*
* @see DSLContext#begin(Collection)
*/
@Support({ POSTGRES })
@Support({ FIREBIRD, POSTGRES })
public static Block begin(Collection<? extends Statement> statements) {
return DSL.using(new DefaultConfiguration()).begin(statements);
}