diff --git a/jOOQ-test/src/org/jooq/test/firebird/create.sql b/jOOQ-test/src/org/jooq/test/firebird/create.sql
index 9f2d2ee9f6..a40f015eaf 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/create.sql
+++ b/jOOQ-test/src/org/jooq/test/firebird/create.sql
@@ -275,7 +275,6 @@ CREATE TABLE x_unused (
 
 CREATE TABLE t_639_numbers_table (
   ID INT NOT NULL,
-  BYTE SMALLINT,
   SHORT SMALLINT,
   "INTEGER" INT,
   "LONG" BIGINT,
@@ -283,7 +282,6 @@ CREATE TABLE t_639_numbers_table (
   SHORT_DECIMAL DECIMAL(4, 0),
   INTEGER_DECIMAL DECIMAL(9, 0),
   LONG_DECIMAL DECIMAL(18, 0),
-  BIG_INTEGER DECIMAL(18, 0),
   BIG_DECIMAL DECIMAL(18, 5),
   "FLOAT" REAL,
   "DOUBLE" DOUBLE PRECISION,
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java
index fee937fec9..a60aebf80b 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java
@@ -8,7 +8,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
  */
 public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = 761587035;
+	private static final long serialVersionUID = -326738085;
 
 	/**
 	 * The singleton instance of T_639_NUMBERS_TABLE
@@ -30,11 +30,6 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 	 */
 	public final org.jooq.TableField<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, this);
 
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BYTE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Short> BYTE = createField("BYTE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.SHORT</code>
 	 */
@@ -70,11 +65,6 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 	 */
 	public final org.jooq.TableField<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Long> LONG_DECIMAL = createField("LONG_DECIMAL", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BIG_INTEGER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Long> BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.SQLDataType.BIGINT, this);
-
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.BIG_DECIMAL</code>
 	 */
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_639NumbersTable.java
index 341070ec0c..19175b7d2a 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/interfaces/IT_639NumbersTable.java
@@ -22,16 +22,6 @@ public interface IT_639NumbersTable extends java.io.Serializable {
 	 */
 	public java.lang.Integer getId();
 
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BYTE</code>
-	 */
-	public void setByte(java.lang.Short value);
-
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BYTE</code>
-	 */
-	public java.lang.Short getByte();
-
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.SHORT</code>
 	 */
@@ -102,16 +92,6 @@ public interface IT_639NumbersTable extends java.io.Serializable {
 	 */
 	public java.lang.Long getLongDecimal();
 
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BIG_INTEGER</code>
-	 */
-	public void setBigInteger(java.lang.Long value);
-
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BIG_INTEGER</code>
-	 */
-	public java.lang.Long getBigInteger();
-
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.BIG_DECIMAL</code>
 	 */
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/records/T_639NumbersTableRecord.java
index b68e253852..5877e0500d 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/records/T_639NumbersTableRecord.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/records/T_639NumbersTableRecord.java
@@ -8,7 +8,7 @@ package org.jooq.test.firebird.generatedclasses.tables.records;
  */
 public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord> implements org.jooq.test.firebird.generatedclasses.tables.interfaces.IT_639NumbersTable {
 
-	private static final long serialVersionUID = -1832099286;
+	private static final long serialVersionUID = -236764286;
 
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.ID</code>
@@ -30,22 +30,6 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 		return getValue(org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.ID);
 	}
 
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BYTE</code>
-	 */
-	@Override
-	public void setByte(java.lang.Short value) {
-		setValue(org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BYTE, value);
-	}
-
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BYTE</code>
-	 */
-	@Override
-	public java.lang.Short getByte() {
-		return getValue(org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BYTE);
-	}
-
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.SHORT</code>
 	 */
@@ -158,22 +142,6 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 		return getValue(org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.LONG_DECIMAL);
 	}
 
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BIG_INTEGER</code>
-	 */
-	@Override
-	public void setBigInteger(java.lang.Long value) {
-		setValue(org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BIG_INTEGER, value);
-	}
-
-	/**
-	 * The table column <code>T_639_NUMBERS_TABLE.BIG_INTEGER</code>
-	 */
-	@Override
-	public java.lang.Long getBigInteger() {
-		return getValue(org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BIG_INTEGER);
-	}
-
 	/**
 	 * The table column <code>T_639_NUMBERS_TABLE.BIG_DECIMAL</code>
 	 */