diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/T_639NumbersTable.java
index edc952506b..c8fbbbddec 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/T_639NumbersTable.java
@@ -9,7 +9,7 @@ package org.jooq.test.jdbc.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_639NumbersTable extends org.jooq.impl.TableImpl<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = 1116539440;
+	private static final long serialVersionUID = 1172183892;
 
 	/**
 	 * The singleton instance of <code>PUBLIC.T_639_NUMBERS_TABLE</code>
@@ -52,27 +52,27 @@ public class T_639NumbersTable extends org.jooq.impl.TableImpl<org.jooq.test.jdb
 	/**
 	 * The column <code>PUBLIC.T_639_NUMBERS_TABLE.BYTE_DECIMAL</code>. 
 	 */
-	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.math.BigDecimal> BYTE_DECIMAL = createField("BYTE_DECIMAL", org.jooq.impl.SQLDataType.NUMERIC, T_639_NUMBERS_TABLE);
+	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Byte> BYTE_DECIMAL = createField("BYTE_DECIMAL", org.jooq.impl.SQLDataType.TINYINT, T_639_NUMBERS_TABLE);
 
 	/**
 	 * The column <code>PUBLIC.T_639_NUMBERS_TABLE.SHORT_DECIMAL</code>. 
 	 */
-	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.math.BigDecimal> SHORT_DECIMAL = createField("SHORT_DECIMAL", org.jooq.impl.SQLDataType.NUMERIC, T_639_NUMBERS_TABLE);
+	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Short> SHORT_DECIMAL = createField("SHORT_DECIMAL", org.jooq.impl.SQLDataType.SMALLINT, T_639_NUMBERS_TABLE);
 
 	/**
 	 * The column <code>PUBLIC.T_639_NUMBERS_TABLE.INTEGER_DECIMAL</code>. 
 	 */
-	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.math.BigDecimal> INTEGER_DECIMAL = createField("INTEGER_DECIMAL", org.jooq.impl.SQLDataType.NUMERIC, T_639_NUMBERS_TABLE);
+	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Integer> INTEGER_DECIMAL = createField("INTEGER_DECIMAL", org.jooq.impl.SQLDataType.INTEGER, T_639_NUMBERS_TABLE);
 
 	/**
 	 * The column <code>PUBLIC.T_639_NUMBERS_TABLE.LONG_DECIMAL</code>. 
 	 */
-	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.math.BigDecimal> LONG_DECIMAL = createField("LONG_DECIMAL", org.jooq.impl.SQLDataType.NUMERIC, T_639_NUMBERS_TABLE);
+	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Long> LONG_DECIMAL = createField("LONG_DECIMAL", org.jooq.impl.SQLDataType.BIGINT, T_639_NUMBERS_TABLE);
 
 	/**
 	 * The column <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_INTEGER</code>. 
 	 */
-	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.math.BigDecimal> BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.SQLDataType.NUMERIC, T_639_NUMBERS_TABLE);
+	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord, java.math.BigInteger> BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.SQLDataType.DECIMAL_INTEGER, T_639_NUMBERS_TABLE);
 
 	/**
 	 * The column <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_DECIMAL</code>. 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/XUnused.java
index 37d804ab53..a30e09bac3 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/XUnused.java
@@ -9,7 +9,7 @@ package org.jooq.test.jdbc.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XUnused extends org.jooq.impl.TableImpl<org.jooq.test.jdbc.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1053241103;
+	private static final long serialVersionUID = -1635063423;
 
 	/**
 	 * The singleton instance of <code>PUBLIC.X_UNUSED</code>
@@ -37,7 +37,7 @@ public class XUnused extends org.jooq.impl.TableImpl<org.jooq.test.jdbc.generate
 	/**
 	 * The column <code>PUBLIC.X_UNUSED.BIG_INTEGER</code>. 
 	 */
-	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.XUnusedRecord, java.math.BigDecimal> BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.SQLDataType.NUMERIC, X_UNUSED);
+	public static final org.jooq.TableField<org.jooq.test.jdbc.generatedclasses.tables.records.XUnusedRecord, java.math.BigInteger> BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.SQLDataType.DECIMAL_INTEGER, X_UNUSED);
 
 	/**
 	 * The column <code>PUBLIC.X_UNUSED.ID_REF</code>. 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IT_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IT_639NumbersTable.java
index 3f4c31216f..ee0d98e6bc 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IT_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IT_639NumbersTable.java
@@ -62,52 +62,52 @@ public interface IT_639NumbersTable extends java.io.Serializable {
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.BYTE_DECIMAL</code>. 
 	 */
-	public void setByteDecimal(java.math.BigDecimal value);
+	public void setByteDecimal(java.lang.Byte value);
 
 	/**
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.BYTE_DECIMAL</code>. 
 	 */
-	public java.math.BigDecimal getByteDecimal();
+	public java.lang.Byte getByteDecimal();
 
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.SHORT_DECIMAL</code>. 
 	 */
-	public void setShortDecimal(java.math.BigDecimal value);
+	public void setShortDecimal(java.lang.Short value);
 
 	/**
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.SHORT_DECIMAL</code>. 
 	 */
-	public java.math.BigDecimal getShortDecimal();
+	public java.lang.Short getShortDecimal();
 
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.INTEGER_DECIMAL</code>. 
 	 */
-	public void setIntegerDecimal(java.math.BigDecimal value);
+	public void setIntegerDecimal(java.lang.Integer value);
 
 	/**
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.INTEGER_DECIMAL</code>. 
 	 */
-	public java.math.BigDecimal getIntegerDecimal();
+	public java.lang.Integer getIntegerDecimal();
 
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.LONG_DECIMAL</code>. 
 	 */
-	public void setLongDecimal(java.math.BigDecimal value);
+	public void setLongDecimal(java.lang.Long value);
 
 	/**
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.LONG_DECIMAL</code>. 
 	 */
-	public java.math.BigDecimal getLongDecimal();
+	public java.lang.Long getLongDecimal();
 
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_INTEGER</code>. 
 	 */
-	public void setBigInteger(java.math.BigDecimal value);
+	public void setBigInteger(java.math.BigInteger value);
 
 	/**
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_INTEGER</code>. 
 	 */
-	public java.math.BigDecimal getBigInteger();
+	public java.math.BigInteger getBigInteger();
 
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_DECIMAL</code>. 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IXUnused.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IXUnused.java
index 592bbacff0..c1cdb255da 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IXUnused.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/interfaces/IXUnused.java
@@ -32,12 +32,12 @@ public interface IXUnused extends java.io.Serializable {
 	/**
 	 * Setter for <code>PUBLIC.X_UNUSED.BIG_INTEGER</code>. 
 	 */
-	public void setBigInteger(java.math.BigDecimal value);
+	public void setBigInteger(java.math.BigInteger value);
 
 	/**
 	 * Getter for <code>PUBLIC.X_UNUSED.BIG_INTEGER</code>. 
 	 */
-	public java.math.BigDecimal getBigInteger();
+	public java.math.BigInteger getBigInteger();
 
 	/**
 	 * Setter for <code>PUBLIC.X_UNUSED.ID_REF</code>. 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/T_639NumbersTable.java
index 08e2441df2..b0d299a6a7 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/T_639NumbersTable.java
@@ -9,18 +9,18 @@ package org.jooq.test.jdbc.generatedclasses.tables.pojos;
 @java.lang.SuppressWarnings("all")
 public class T_639NumbersTable implements org.jooq.test.jdbc.generatedclasses.tables.interfaces.IT_639NumbersTable {
 
-	private static final long serialVersionUID = 1843181115;
+	private static final long serialVersionUID = 571478354;
 
 	private java.lang.Integer    id;
 	private java.lang.Byte       byte_;
 	private java.lang.Short      short_;
 	private java.lang.Integer    integer;
 	private java.lang.Long       long_;
-	private java.math.BigDecimal byteDecimal;
-	private java.math.BigDecimal shortDecimal;
-	private java.math.BigDecimal integerDecimal;
-	private java.math.BigDecimal longDecimal;
-	private java.math.BigDecimal bigInteger;
+	private java.lang.Byte       byteDecimal;
+	private java.lang.Short      shortDecimal;
+	private java.lang.Integer    integerDecimal;
+	private java.lang.Long       longDecimal;
+	private java.math.BigInteger bigInteger;
 	private java.math.BigDecimal bigDecimal;
 	private java.lang.Float      float_;
 	private java.lang.Double     double_;
@@ -76,52 +76,52 @@ public class T_639NumbersTable implements org.jooq.test.jdbc.generatedclasses.ta
 	}
 
 	@Override
-	public java.math.BigDecimal getByteDecimal() {
+	public java.lang.Byte getByteDecimal() {
 		return this.byteDecimal;
 	}
 
 	@Override
-	public void setByteDecimal(java.math.BigDecimal byteDecimal) {
+	public void setByteDecimal(java.lang.Byte byteDecimal) {
 		this.byteDecimal = byteDecimal;
 	}
 
 	@Override
-	public java.math.BigDecimal getShortDecimal() {
+	public java.lang.Short getShortDecimal() {
 		return this.shortDecimal;
 	}
 
 	@Override
-	public void setShortDecimal(java.math.BigDecimal shortDecimal) {
+	public void setShortDecimal(java.lang.Short shortDecimal) {
 		this.shortDecimal = shortDecimal;
 	}
 
 	@Override
-	public java.math.BigDecimal getIntegerDecimal() {
+	public java.lang.Integer getIntegerDecimal() {
 		return this.integerDecimal;
 	}
 
 	@Override
-	public void setIntegerDecimal(java.math.BigDecimal integerDecimal) {
+	public void setIntegerDecimal(java.lang.Integer integerDecimal) {
 		this.integerDecimal = integerDecimal;
 	}
 
 	@Override
-	public java.math.BigDecimal getLongDecimal() {
+	public java.lang.Long getLongDecimal() {
 		return this.longDecimal;
 	}
 
 	@Override
-	public void setLongDecimal(java.math.BigDecimal longDecimal) {
+	public void setLongDecimal(java.lang.Long longDecimal) {
 		this.longDecimal = longDecimal;
 	}
 
 	@Override
-	public java.math.BigDecimal getBigInteger() {
+	public java.math.BigInteger getBigInteger() {
 		return this.bigInteger;
 	}
 
 	@Override
-	public void setBigInteger(java.math.BigDecimal bigInteger) {
+	public void setBigInteger(java.math.BigInteger bigInteger) {
 		this.bigInteger = bigInteger;
 	}
 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/XUnused.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/XUnused.java
index a8adc33b66..cebecc03d4 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/pojos/XUnused.java
@@ -9,11 +9,11 @@ package org.jooq.test.jdbc.generatedclasses.tables.pojos;
 @java.lang.SuppressWarnings("all")
 public class XUnused implements org.jooq.test.jdbc.generatedclasses.tables.interfaces.IXUnused {
 
-	private static final long serialVersionUID = -1605926846;
+	private static final long serialVersionUID = 1402670607;
 
 	private java.lang.Integer    id;
 	private java.lang.String     name;
-	private java.math.BigDecimal bigInteger;
+	private java.math.BigInteger bigInteger;
 	private java.lang.Integer    idRef;
 	private java.lang.String     nameRef;
 	private java.lang.Integer    class_;
@@ -49,12 +49,12 @@ public class XUnused implements org.jooq.test.jdbc.generatedclasses.tables.inter
 	}
 
 	@Override
-	public java.math.BigDecimal getBigInteger() {
+	public java.math.BigInteger getBigInteger() {
 		return this.bigInteger;
 	}
 
 	@Override
-	public void setBigInteger(java.math.BigDecimal bigInteger) {
+	public void setBigInteger(java.math.BigInteger bigInteger) {
 		this.bigInteger = bigInteger;
 	}
 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java
index 46fe1622d3..9ad08f80f6 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java
@@ -7,9 +7,9 @@ package org.jooq.test.jdbc.generatedclasses.tables.records;
  * This class is generated by jOOQ.
  */
 @java.lang.SuppressWarnings("all")
-public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord> implements org.jooq.Record13<java.lang.Integer, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.lang.Float, java.lang.Double>, org.jooq.test.jdbc.generatedclasses.tables.interfaces.IT_639NumbersTable {
+public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.jdbc.generatedclasses.tables.records.T_639NumbersTableRecord> implements org.jooq.Record13<java.lang.Integer, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.math.BigInteger, java.math.BigDecimal, java.lang.Float, java.lang.Double>, org.jooq.test.jdbc.generatedclasses.tables.interfaces.IT_639NumbersTable {
 
-	private static final long serialVersionUID = 749597441;
+	private static final long serialVersionUID = -761297698;
 
 	/**
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.ID</code>. 
@@ -95,7 +95,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.BYTE_DECIMAL</code>. 
 	 */
 	@Override
-	public void setByteDecimal(java.math.BigDecimal value) {
+	public void setByteDecimal(java.lang.Byte value) {
 		setValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.BYTE_DECIMAL, value);
 	}
 
@@ -103,7 +103,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.BYTE_DECIMAL</code>. 
 	 */
 	@Override
-	public java.math.BigDecimal getByteDecimal() {
+	public java.lang.Byte getByteDecimal() {
 		return getValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.BYTE_DECIMAL);
 	}
 
@@ -111,7 +111,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.SHORT_DECIMAL</code>. 
 	 */
 	@Override
-	public void setShortDecimal(java.math.BigDecimal value) {
+	public void setShortDecimal(java.lang.Short value) {
 		setValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.SHORT_DECIMAL, value);
 	}
 
@@ -119,7 +119,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.SHORT_DECIMAL</code>. 
 	 */
 	@Override
-	public java.math.BigDecimal getShortDecimal() {
+	public java.lang.Short getShortDecimal() {
 		return getValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.SHORT_DECIMAL);
 	}
 
@@ -127,7 +127,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.INTEGER_DECIMAL</code>. 
 	 */
 	@Override
-	public void setIntegerDecimal(java.math.BigDecimal value) {
+	public void setIntegerDecimal(java.lang.Integer value) {
 		setValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.INTEGER_DECIMAL, value);
 	}
 
@@ -135,7 +135,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.INTEGER_DECIMAL</code>. 
 	 */
 	@Override
-	public java.math.BigDecimal getIntegerDecimal() {
+	public java.lang.Integer getIntegerDecimal() {
 		return getValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.INTEGER_DECIMAL);
 	}
 
@@ -143,7 +143,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.LONG_DECIMAL</code>. 
 	 */
 	@Override
-	public void setLongDecimal(java.math.BigDecimal value) {
+	public void setLongDecimal(java.lang.Long value) {
 		setValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.LONG_DECIMAL, value);
 	}
 
@@ -151,7 +151,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.LONG_DECIMAL</code>. 
 	 */
 	@Override
-	public java.math.BigDecimal getLongDecimal() {
+	public java.lang.Long getLongDecimal() {
 		return getValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.LONG_DECIMAL);
 	}
 
@@ -159,7 +159,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Setter for <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_INTEGER</code>. 
 	 */
 	@Override
-	public void setBigInteger(java.math.BigDecimal value) {
+	public void setBigInteger(java.math.BigInteger value) {
 		setValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.BIG_INTEGER, value);
 	}
 
@@ -167,7 +167,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * Getter for <code>PUBLIC.T_639_NUMBERS_TABLE.BIG_INTEGER</code>. 
 	 */
 	@Override
-	public java.math.BigDecimal getBigInteger() {
+	public java.math.BigInteger getBigInteger() {
 		return getValue(org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.BIG_INTEGER);
 	}
 
@@ -231,7 +231,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row13<java.lang.Integer, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.lang.Float, java.lang.Double> fieldsRow() {
+	public org.jooq.Row13<java.lang.Integer, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.math.BigInteger, java.math.BigDecimal, java.lang.Float, java.lang.Double> fieldsRow() {
 		return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13());
 	}
 
@@ -239,7 +239,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row13<java.lang.Integer, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.math.BigDecimal, java.lang.Float, java.lang.Double> valuesRow() {
+	public org.jooq.Row13<java.lang.Integer, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.lang.Byte, java.lang.Short, java.lang.Integer, java.lang.Long, java.math.BigInteger, java.math.BigDecimal, java.lang.Float, java.lang.Double> valuesRow() {
 		return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13());
 	}
 
@@ -287,7 +287,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.math.BigDecimal> field6() {
+	public org.jooq.Field<java.lang.Byte> field6() {
 		return org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.BYTE_DECIMAL;
 	}
 
@@ -295,7 +295,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.math.BigDecimal> field7() {
+	public org.jooq.Field<java.lang.Short> field7() {
 		return org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.SHORT_DECIMAL;
 	}
 
@@ -303,7 +303,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.math.BigDecimal> field8() {
+	public org.jooq.Field<java.lang.Integer> field8() {
 		return org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.INTEGER_DECIMAL;
 	}
 
@@ -311,7 +311,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.math.BigDecimal> field9() {
+	public org.jooq.Field<java.lang.Long> field9() {
 		return org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.LONG_DECIMAL;
 	}
 
@@ -319,7 +319,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.math.BigDecimal> field10() {
+	public org.jooq.Field<java.math.BigInteger> field10() {
 		return org.jooq.test.jdbc.generatedclasses.tables.T_639NumbersTable.BIG_INTEGER;
 	}
 
@@ -391,7 +391,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.math.BigDecimal value6() {
+	public java.lang.Byte value6() {
 		return getByteDecimal();
 	}
 
@@ -399,7 +399,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.math.BigDecimal value7() {
+	public java.lang.Short value7() {
 		return getShortDecimal();
 	}
 
@@ -407,7 +407,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.math.BigDecimal value8() {
+	public java.lang.Integer value8() {
 		return getIntegerDecimal();
 	}
 
@@ -415,7 +415,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.math.BigDecimal value9() {
+	public java.lang.Long value9() {
 		return getLongDecimal();
 	}
 
@@ -423,7 +423,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl<org.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.math.BigDecimal value10() {
+	public java.math.BigInteger value10() {
 		return getBigInteger();
 	}
 
diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java
index 017eaa94b1..2dd674c279 100644
--- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java
@@ -7,9 +7,9 @@ package org.jooq.test.jdbc.generatedclasses.tables.records;
  * This class is generated by jOOQ.
  */
 @java.lang.SuppressWarnings("all")
-public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.jdbc.generatedclasses.tables.records.XUnusedRecord> implements org.jooq.Record16<java.lang.Integer, java.lang.String, java.math.BigDecimal, java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.math.BigDecimal>, org.jooq.test.jdbc.generatedclasses.tables.interfaces.IXUnused {
+public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.jdbc.generatedclasses.tables.records.XUnusedRecord> implements org.jooq.Record16<java.lang.Integer, java.lang.String, java.math.BigInteger, java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.math.BigDecimal>, org.jooq.test.jdbc.generatedclasses.tables.interfaces.IXUnused {
 
-	private static final long serialVersionUID = 1760046493;
+	private static final long serialVersionUID = 243436080;
 
 	/**
 	 * Setter for <code>PUBLIC.X_UNUSED.ID</code>. 
@@ -47,7 +47,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.j
 	 * Setter for <code>PUBLIC.X_UNUSED.BIG_INTEGER</code>. 
 	 */
 	@Override
-	public void setBigInteger(java.math.BigDecimal value) {
+	public void setBigInteger(java.math.BigInteger value) {
 		setValue(org.jooq.test.jdbc.generatedclasses.tables.XUnused.BIG_INTEGER, value);
 	}
 
@@ -55,7 +55,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.j
 	 * Getter for <code>PUBLIC.X_UNUSED.BIG_INTEGER</code>. 
 	 */
 	@Override
-	public java.math.BigDecimal getBigInteger() {
+	public java.math.BigInteger getBigInteger() {
 		return getValue(org.jooq.test.jdbc.generatedclasses.tables.XUnused.BIG_INTEGER);
 	}
 
@@ -279,7 +279,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row16<java.lang.Integer, java.lang.String, java.math.BigDecimal, java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.math.BigDecimal> fieldsRow() {
+	public org.jooq.Row16<java.lang.Integer, java.lang.String, java.math.BigInteger, java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.math.BigDecimal> fieldsRow() {
 		return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16());
 	}
 
@@ -287,7 +287,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row16<java.lang.Integer, java.lang.String, java.math.BigDecimal, java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.math.BigDecimal> valuesRow() {
+	public org.jooq.Row16<java.lang.Integer, java.lang.String, java.math.BigInteger, java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.math.BigDecimal> valuesRow() {
 		return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16());
 	}
 
@@ -311,7 +311,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.math.BigDecimal> field3() {
+	public org.jooq.Field<java.math.BigInteger> field3() {
 		return org.jooq.test.jdbc.generatedclasses.tables.XUnused.BIG_INTEGER;
 	}
 
@@ -439,7 +439,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.j
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.math.BigDecimal value3() {
+	public java.math.BigInteger value3() {
 		return getBigInteger();
 	}
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index f22b16457a..e395e61372 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -212,11 +212,13 @@ class MetaImpl implements Meta {
                 for (Record column : columns) {
                     String columnName = column.getValue("COLUMN_NAME", String.class);
                     String typeName = column.getValue("TYPE_NAME", String.class);
+                    int precision = column.getValue("COLUMN_SIZE", int.class);
+                    int scale = column.getValue("DECIMAL_DIGITS", int.class);
 
                     // TODO: Exception handling should be moved inside SQLDataType
                     DataType<?> type = null;
                     try {
-                        type = SQLDataType.getDataType(SQLDialect.SQL99, typeName);
+                        type = FieldTypeHelper.getDialectDataType(SQLDialect.SQL99, typeName, precision, scale);
                     }
                     catch (SQLDialectNotSupportedException e) {
                         type = SQLDataType.OTHER;