From 66f2ed394693a2c8c9f5b1ce0b5d5d7da9f21e7c Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 29 Dec 2017 17:01:02 +0100
Subject: [PATCH] [#6485] [#6969] Supported Firebird ALTER TABLE .. ALTER col
 TO newname syntax

---
 .../resources/org/jooq/web/grammar-3.11.txt   |  1 +
 jOOQ/src/main/java/org/jooq/DSLContext.java   |  4 +--
 .../main/java/org/jooq/impl/BlockImpl.java    | 31 ++++++++++++++++---
 jOOQ/src/main/java/org/jooq/impl/DSL.java     |  4 +--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
index c90614fe9c..1c3b4bfe97 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
@@ -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
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index fc0b7fd5d9..2afb8e55c8 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -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);
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
index 30cda863e7..40f71a3c4d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
@@ -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;
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 15467480a4..0f6a5f4eae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -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);
     }