From c457958bb4b9877bcff764785dab00d69f1c1456 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sun, 19 Aug 2012 13:30:13 +0200
Subject: [PATCH] [#430] Add support for the Firebird database - Fixed more
 data types

---
 .../jooq/util/firebird/FirebirdDataType.java  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java
index bd7d984960..0a6f5214b6 100644
--- a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java
@@ -43,8 +43,6 @@ import java.sql.Time;
 import java.sql.Timestamp;
 
 import org.jooq.DataType;
-import org.jooq.Record;
-import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.impl.AbstractDataType;
 import org.jooq.impl.SQLDataType;
@@ -98,11 +96,16 @@ public class FirebirdDataType<T> extends AbstractDataType<T> {
     // Compatibility types for supported SQLDataTypes
     // -------------------------------------------------------------------------
 
-    protected static final FirebirdDataType<Byte>   __TINYINT              = new FirebirdDataType<Byte>(SQLDataType.TINYINT, "smallint");
-    protected static final FirebirdDataType<String> __NCHAR                = new FirebirdDataType<String>(SQLDataType.NCHAR, "char");
-    protected static final FirebirdDataType<String> __NCLOB                = new FirebirdDataType<String>(SQLDataType.NCLOB, "clob");
-    protected static final FirebirdDataType<String> __LONGNVARCHAR         = new FirebirdDataType<String>(SQLDataType.LONGNVARCHAR, "longvarchar");
-    protected static final FirebirdDataType<String> __NVARCHAR             = new FirebirdDataType<String>(SQLDataType.NVARCHAR, "varchar", "varchar(32672)");
+    protected static final FirebirdDataType<byte[]>  __BINARY               = new FirebirdDataType<byte[]>(SQLDataType.BINARY, "blob");
+    protected static final FirebirdDataType<Double>  __FLOAT                = new FirebirdDataType<Double>(SQLDataType.FLOAT, "double precision");
+    protected static final FirebirdDataType<String>  __LONGNVARCHAR         = new FirebirdDataType<String>(SQLDataType.LONGNVARCHAR, "blob sub_type text");
+    protected static final FirebirdDataType<byte[]>  __LONGVARBINARY        = new FirebirdDataType<byte[]>(SQLDataType.LONGVARBINARY, "blob");
+    protected static final FirebirdDataType<String>  __LONGVARCHAR          = new FirebirdDataType<String>(SQLDataType.LONGVARCHAR, "varchar", "varchar(32672)");
+    protected static final FirebirdDataType<String>  __NCHAR                = new FirebirdDataType<String>(SQLDataType.NCHAR, "char");
+    protected static final FirebirdDataType<String>  __NCLOB                = new FirebirdDataType<String>(SQLDataType.NCLOB, "clob");
+    protected static final FirebirdDataType<String>  __NVARCHAR             = new FirebirdDataType<String>(SQLDataType.NVARCHAR, "varchar", "varchar(32672)");
+    protected static final FirebirdDataType<Byte>    __TINYINT              = new FirebirdDataType<Byte>(SQLDataType.TINYINT, "smallint");
+    protected static final FirebirdDataType<byte[]>  __VARBINARY            = new FirebirdDataType<byte[]>(SQLDataType.VARBINARY, "blob");
 
     // -------------------------------------------------------------------------
     // Compatibility types for supported Java types
@@ -114,11 +117,6 @@ public class FirebirdDataType<T> extends AbstractDataType<T> {
     // Dialect-specific data types and synonyms thereof
     // -------------------------------------------------------------------------
 
-    public static final FirebirdDataType<String>         VARCHARIGNORECASE = new FirebirdDataType<String>(SQLDataType.VARCHAR, "varchar_ignorecase", "varchar_ignorecase(32672)");
-    public static final FirebirdDataType<Object>         OBJECT            = new FirebirdDataType<Object>(SQLDataType.OTHER, "object");
-    public static final FirebirdDataType<Result<Record>> ROW               = new FirebirdDataType<Result<Record>>(SQLDataType.RESULT, "row");
-
-
     private FirebirdDataType(SQLDataType<T> sqlDataType, String typeName) {
         super(SQLDialect.FIREBIRD, sqlDataType, sqlDataType.getType(), typeName);
     }