From ff09bb70b0459123427339dbd51237a4cb8fbbdd Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Sat, 30 May 2015 11:47:33 +0200
Subject: [PATCH] [#4333] Firebird CREATE TABLE regression when columns are
 nullable

---
 jOOQ/src/main/java/org/jooq/CreateTableAsStep.java    | 3 +--
 jOOQ/src/main/java/org/jooq/SelectIntoStep.java       | 3 +--
 jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
index df9d3a5b0e..7fd4e50938 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
@@ -45,7 +45,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
-import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 // ...
 import static org.jooq.SQLDialect.HSQLDB;
@@ -67,7 +66,7 @@ public interface CreateTableAsStep<R extends Record> {
     /**
      * Add an <code>AS</code> clause to the <code>CREATE TABLE</code> statement.
      */
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     CreateTableOnCommitStep as(Select<? extends R> select);
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectIntoStep.java b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java
index 55979027cb..355f87be8a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectIntoStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java
@@ -44,7 +44,6 @@ package org.jooq;
 // ...
 import static org.jooq.SQLDialect.CUBRID;
 // ...
-import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.H2;
 // ...
 import static org.jooq.SQLDialect.HSQLDB;
@@ -104,6 +103,6 @@ public interface SelectIntoStep<R extends Record> extends SelectFromStep<R> {
     /**
      * Add an <code>INTO</code> clause to the <code>SELECT</code> statement.
      */
-    @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     SelectIntoStep<Record> into(Table<?> table);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
index 96287c28ee..dbcc5e9fec 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -48,6 +48,7 @@ import static org.jooq.Clause.CREATE_TABLE_NAME;
 // ...
 // ...
 import static org.jooq.SQLDialect.DERBY;
+import static org.jooq.SQLDialect.FIREBIRD;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
@@ -183,7 +184,7 @@ class CreateTableImpl<R extends Record> extends AbstractQuery implements
                 if (type.nullable()) {
 
                     // [#4321] Not all dialects support explicit NULL type declarations
-                    if (!asList(DERBY).contains(ctx.family()))
+                    if (!asList(DERBY, FIREBIRD).contains(ctx.family()))
                         ctx.sql(' ').keyword("null");
                 }
                 else {