From c3191a0dd36538da3b480575fe4ced2d39d0d76c Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 19 Nov 2011 10:05:48 +0000
Subject: [PATCH] [#955] Generate a reference to every type in a new UDTs.java
 class

---
 .../examples/mysql/sakila/tables/Address.java |  4 +-
 .../examples/mysql/sakila/tables/City.java    |  4 +-
 .../examples/mysql/sakila/tables/Country.java |  4 +-
 .../tables/records/XUnusedRecord.java         | 22 +-------
 .../tables/records/XUnusedRecord.java         | 30 +----------
 .../tables/records/XUnusedRecord.java         | 22 +-------
 .../tables/records/XUnusedRecord.java         | 30 +----------
 .../tables/records/XUnusedRecord.java         | 22 +-------
 .../src/org/jooq/test/jOOQOracleTest.java     |  2 +-
 .../tables/records/XUnusedRecord.java         | 22 +-------
 .../test/oracle/generatedclasses/UDTs.java    | 54 +++++++++++++++++++
 .../test/postgres/generatedclasses/UDTs.java  | 29 ++++++++++
 .../tables/records/XUnusedRecord.java         | 26 +--------
 .../test/sqlite/generatedclasses/Keys.java    |  1 +
 .../generatedclasses/tables/TTriggers.java    |  7 ++-
 .../tables/records/XUnusedRecord.java         | 22 +-------
 .../tables/records/XUnusedRecord.java         | 22 +-------
 .../tables/records/XUnusedRecord.java         | 22 +-------
 18 files changed, 104 insertions(+), 241 deletions(-)
 create mode 100644 jOOQ-test/src/org/jooq/test/oracle/generatedclasses/UDTs.java
 create mode 100644 jOOQ-test/src/org/jooq/test/postgres/generatedclasses/UDTs.java

diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Address.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Address.java
index 4edb53542e..4fb4c105ea 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Address.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Address.java
@@ -10,7 +10,7 @@ package org.jooq.examples.mysql.sakila.tables;
                             comments = "This class is generated by jOOQ")
 public class Address extends org.jooq.impl.UpdatableTableImpl<org.jooq.examples.mysql.sakila.tables.records.AddressRecord> {
 
-	private static final long serialVersionUID = -824052744;
+	private static final long serialVersionUID = -255466610;
 
 	/**
 	 * The singleton instance of address
@@ -39,8 +39,6 @@ public class Address extends org.jooq.impl.UpdatableTableImpl<org.jooq.examples.
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public final org.jooq.TableField<org.jooq.examples.mysql.sakila.tables.records.AddressRecord, java.lang.String> ADDRESS_ = createField("address", org.jooq.impl.SQLDataType.VARCHAR, this);
 
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/City.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/City.java
index 10fda85f67..93daf686fc 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/City.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/City.java
@@ -10,7 +10,7 @@ package org.jooq.examples.mysql.sakila.tables;
                             comments = "This class is generated by jOOQ")
 public class City extends org.jooq.impl.UpdatableTableImpl<org.jooq.examples.mysql.sakila.tables.records.CityRecord> {
 
-	private static final long serialVersionUID = -2142853606;
+	private static final long serialVersionUID = -1954219428;
 
 	/**
 	 * The singleton instance of city
@@ -39,8 +39,6 @@ public class City extends org.jooq.impl.UpdatableTableImpl<org.jooq.examples.mys
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public final org.jooq.TableField<org.jooq.examples.mysql.sakila.tables.records.CityRecord, java.lang.String> CITY_ = createField("city", org.jooq.impl.SQLDataType.VARCHAR, this);
 
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Country.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Country.java
index 19cafe270f..ed74377d3d 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Country.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/Country.java
@@ -10,7 +10,7 @@ package org.jooq.examples.mysql.sakila.tables;
                             comments = "This class is generated by jOOQ")
 public class Country extends org.jooq.impl.UpdatableTableImpl<org.jooq.examples.mysql.sakila.tables.records.CountryRecord> {
 
-	private static final long serialVersionUID = 1701776000;
+	private static final long serialVersionUID = -1109437430;
 
 	/**
 	 * The singleton instance of country
@@ -39,8 +39,6 @@ public class Country extends org.jooq.impl.UpdatableTableImpl<org.jooq.examples.
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public final org.jooq.TableField<org.jooq.examples.mysql.sakila.tables.records.CountryRecord, java.lang.String> COUNTRY_ = createField("country", org.jooq.impl.SQLDataType.VARCHAR, this);
 
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XUnusedRecord.java
index fb0c12e1c7..9f7ddbdf16 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.ase.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.ase.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1328591388;
+	private static final long serialVersionUID = -1909419238;
 
 	/**
 	 * An uncommented item
@@ -166,8 +166,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.ase.generatedclasses.tables.XUnused.CLASS, value);
@@ -175,8 +173,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.ase.generatedclasses.tables.XUnused.CLASS);
@@ -184,8 +180,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.ase.generatedclasses.tables.XUnused.FIELDS, value);
@@ -193,8 +187,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.ase.generatedclasses.tables.XUnused.FIELDS);
@@ -202,8 +194,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.ase.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -211,8 +201,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.ase.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -234,8 +222,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.ase.generatedclasses.tables.XUnused.META_DATA, value);
@@ -243,8 +229,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.ase.generatedclasses.tables.XUnused.META_DATA);
@@ -252,8 +236,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.ase.generatedclasses.tables.XUnused.TYPE0, value);
@@ -261,8 +243,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.ase.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java
index fd66880ab7..a4535b27af 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.db2.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.db2.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1565988399;
+	private static final long serialVersionUID = 1771455565;
 
 	/**
 	 * An uncommented item
@@ -142,8 +142,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.CLASS, value);
@@ -151,8 +149,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.CLASS);
@@ -160,8 +156,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.FIELDS, value);
@@ -169,8 +163,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.FIELDS);
@@ -178,8 +170,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setTable_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.TABLE, value);
@@ -187,8 +177,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getTable_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.TABLE);
@@ -196,8 +184,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -205,8 +191,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -228,8 +212,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.META_DATA, value);
@@ -237,8 +219,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.META_DATA);
@@ -246,8 +226,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setValues_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.VALUES, value);
@@ -255,8 +233,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getValues_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.VALUES);
@@ -264,8 +240,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.db2.generatedclasses.tables.XUnused.TYPE0, value);
@@ -273,8 +247,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.db2.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/XUnusedRecord.java
index a7257f3290..6730362a72 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.derby.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.derby.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = 101963893;
+	private static final long serialVersionUID = -634090443;
 
 	/**
 	 * An uncommented item
@@ -142,8 +142,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.derby.generatedclasses.tables.XUnused.CLASS, value);
@@ -151,8 +149,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.derby.generatedclasses.tables.XUnused.CLASS);
@@ -160,8 +156,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.derby.generatedclasses.tables.XUnused.FIELDS, value);
@@ -169,8 +163,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.derby.generatedclasses.tables.XUnused.FIELDS);
@@ -178,8 +170,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.derby.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -187,8 +177,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.derby.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -210,8 +198,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.derby.generatedclasses.tables.XUnused.META_DATA, value);
@@ -219,8 +205,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.derby.generatedclasses.tables.XUnused.META_DATA);
@@ -228,8 +212,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.derby.generatedclasses.tables.XUnused.TYPE0, value);
@@ -237,8 +219,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.derby.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/XUnusedRecord.java
index 6f29a5e455..db598b4306 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.h2.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -921574161;
+	private static final long serialVersionUID = -1500963677;
 
 	/**
 	 * An uncommented item
@@ -124,8 +124,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.CLASS, value);
@@ -133,8 +131,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.CLASS);
@@ -142,8 +138,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.FIELDS, value);
@@ -151,8 +145,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.FIELDS);
@@ -160,8 +152,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setTable_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.TABLE, value);
@@ -169,8 +159,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getTable_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.TABLE);
@@ -178,8 +166,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -187,8 +173,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -210,8 +194,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.META_DATA, value);
@@ -219,8 +201,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.META_DATA);
@@ -228,8 +208,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setValues_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.VALUES, value);
@@ -237,8 +215,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getValues_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.VALUES);
@@ -246,8 +222,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.h2.generatedclasses.tables.XUnused.TYPE0, value);
@@ -255,8 +229,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.h2.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java
index f9f0f265b7..e23530a9b1 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.ingres.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.ingres.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -2085185235;
+	private static final long serialVersionUID = 1010394253;
 
 	/**
 	 * An uncommented item
@@ -142,8 +142,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.CLASS, value);
@@ -151,8 +149,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.CLASS);
@@ -160,8 +156,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.FIELDS, value);
@@ -169,8 +163,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.FIELDS);
@@ -178,8 +170,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -187,8 +177,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -210,8 +198,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.META_DATA, value);
@@ -219,8 +205,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.META_DATA);
@@ -228,8 +212,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.TYPE0, value);
@@ -237,8 +219,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.ingres.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
index 1ce94b97d8..8f0e2156ec 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
@@ -54,7 +54,7 @@ import static org.jooq.test.oracle.generatedclasses.Tables.T_TRIGGERS;
 import static org.jooq.test.oracle.generatedclasses.Tables.V_AUTHOR;
 import static org.jooq.test.oracle.generatedclasses.Tables.V_BOOK;
 import static org.jooq.test.oracle.generatedclasses.Tables.V_LIBRARY;
-import static org.jooq.test.oracle.generatedclasses.udt.UAuthorType.U_AUTHOR_TYPE;
+import static org.jooq.test.oracle.generatedclasses.UDTs.U_AUTHOR_TYPE;
 import static org.jooq.test.oracle.generatedclasses.udt.UAuthorType.countBooks;
 import static org.jooq.test.oracle.generatedclasses.udt.UAuthorType.load;
 import static org.jooq.util.oracle.OracleFactory.connectByIsCycle;
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/XUnusedRecord.java
index 44f49c65bd..f46d50bc44 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/tables/records/XUnusedRecord.java
@@ -12,7 +12,7 @@ package org.jooq.test.mysql.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.mysql.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1275824907;
+	private static final long serialVersionUID = -1792025495;
 
 	/**
 	 * An uncommented item
@@ -156,8 +156,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.CLASS, value);
@@ -165,8 +163,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.CLASS);
@@ -174,8 +170,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.FIELDS, value);
@@ -183,8 +177,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.FIELDS);
@@ -192,8 +184,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -201,8 +191,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -224,8 +212,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.META_DATA, value);
@@ -233,8 +219,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.META_DATA);
@@ -242,8 +226,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.TYPE0, value);
@@ -251,8 +233,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.mysql.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/UDTs.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/UDTs.java
new file mode 100644
index 0000000000..e79f6714f1
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/UDTs.java
@@ -0,0 +1,54 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * Convenience access to all UDTs in TEST
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.0"},
+                            comments = "This class is generated by jOOQ")
+public final class UDTs {
+
+	/**
+	 * The type TEST.O_INVALID_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.OInvalidType O_INVALID_TYPE = org.jooq.test.oracle.generatedclasses.udt.OInvalidType.O_INVALID_TYPE;
+
+	/**
+	 * The type TEST.T_INVALID_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.TInvalidType T_INVALID_TYPE = org.jooq.test.oracle.generatedclasses.udt.TInvalidType.T_INVALID_TYPE;
+
+	/**
+	 * The type TEST.U_ADDRESS_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.UAddressType U_ADDRESS_TYPE = org.jooq.test.oracle.generatedclasses.udt.UAddressType.U_ADDRESS_TYPE;
+
+	/**
+	 * The type TEST.U_AUTHOR_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.UAuthorType U_AUTHOR_TYPE = org.jooq.test.oracle.generatedclasses.udt.UAuthorType.U_AUTHOR_TYPE;
+
+	/**
+	 * The type TEST.U_BOOK_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.UBookType U_BOOK_TYPE = org.jooq.test.oracle.generatedclasses.udt.UBookType.U_BOOK_TYPE;
+
+	/**
+	 * The type TEST.U_INVALID_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.UInvalidType U_INVALID_TYPE = org.jooq.test.oracle.generatedclasses.udt.UInvalidType.U_INVALID_TYPE;
+
+	/**
+	 * The type TEST.U_STREET_TYPE
+	 */
+	public static org.jooq.test.oracle.generatedclasses.udt.UStreetType U_STREET_TYPE = org.jooq.test.oracle.generatedclasses.udt.UStreetType.U_STREET_TYPE;
+
+	/**
+	 * No instances
+	 */
+	private UDTs() {}
+}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/UDTs.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/UDTs.java
new file mode 100644
index 0000000000..e2fffb21e9
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/UDTs.java
@@ -0,0 +1,29 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.postgres.generatedclasses;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * Convenience access to all UDTs in public
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.0"},
+                            comments = "This class is generated by jOOQ")
+public final class UDTs {
+
+	/**
+	 * The type public.u_address_type
+	 */
+	public static org.jooq.test.postgres.generatedclasses.udt.UAddressType U_ADDRESS_TYPE = org.jooq.test.postgres.generatedclasses.udt.UAddressType.U_ADDRESS_TYPE;
+
+	/**
+	 * The type public.u_street_type
+	 */
+	public static org.jooq.test.postgres.generatedclasses.udt.UStreetType U_STREET_TYPE = org.jooq.test.postgres.generatedclasses.udt.UStreetType.U_STREET_TYPE;
+
+	/**
+	 * No instances
+	 */
+	private UDTs() {}
+}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/XUnusedRecord.java
index 1a3b1a6305..569c273055 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.postgres.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.postgres.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = 916039006;
+	private static final long serialVersionUID = 465477688;
 
 	/**
 	 * An uncommented item
@@ -142,8 +142,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.CLASS, value);
@@ -151,8 +149,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.CLASS);
@@ -160,8 +156,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.FIELDS, value);
@@ -169,8 +163,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.FIELDS);
@@ -178,8 +170,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.CONFIGURATION, value);
@@ -187,8 +177,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.CONFIGURATION);
@@ -210,8 +198,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.META_DATA, value);
@@ -219,8 +205,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.META_DATA);
@@ -228,8 +212,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setValues_(java.lang.Integer value) {
 		setValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.VALUES, value);
@@ -237,8 +219,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getValues_() {
 		return getValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.VALUES);
@@ -246,8 +226,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.TYPE0, value);
@@ -255,8 +233,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.postgres.generatedclasses.tables.XUnused.X_UNUSED.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
index 5377de7ba9..ea388a870a 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
@@ -14,6 +14,7 @@ package org.jooq.test.sqlite.generatedclasses;
 public class Keys extends org.jooq.impl.AbstractKeys {
 
 	// IDENTITY definitions
+	public static final org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> IDENTITY_t_triggers = createIdentity(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED);
 
 	// UNIQUE and PRIMARY KEY definitions
 	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> pk_t_639_numbers_table_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.ID);
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
index 39fa8a9454..be44529a3f 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
@@ -10,7 +10,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
                             comments = "This class is generated by jOOQ")
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 2031756274;
+	private static final long serialVersionUID = 1709423919;
 
 	/**
 	 * The singleton instance of t_triggers
@@ -54,6 +54,11 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 		super("t_triggers");
 	}
 
+	@Override
+	public org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> getIdentity() {
+		return org.jooq.test.sqlite.generatedclasses.Keys.IDENTITY_t_triggers;
+	}
+
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> getMainKey() {
 		return org.jooq.test.sqlite.generatedclasses.Keys.pk_t_triggers_id_generated;
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java
index 34c4d7e55f..594a03b8bf 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.sqlite.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1446817317;
+	private static final long serialVersionUID = 1286620055;
 
 	/**
 	 * An uncommented item
@@ -78,8 +78,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.CLASS, value);
@@ -87,8 +85,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.CLASS);
@@ -96,8 +92,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.FIELDS, value);
@@ -105,8 +99,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.FIELDS);
@@ -114,8 +106,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.CONFIGURATION, value);
@@ -123,8 +113,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.CONFIGURATION);
@@ -146,8 +134,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.META_DATA, value);
@@ -155,8 +141,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.META_DATA);
@@ -164,8 +148,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.TYPE0, value);
@@ -173,8 +155,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.sqlite.generatedclasses.tables.XUnused.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/XUnusedRecord.java
index 990ba61697..96c2ec234e 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.sqlserver.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sqlserver.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1438944844;
+	private static final long serialVersionUID = 1062696916;
 
 	/**
 	 * An uncommented item
@@ -142,8 +142,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.CLASS, value);
@@ -151,8 +149,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.CLASS);
@@ -160,8 +156,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.FIELDS, value);
@@ -169,8 +163,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.FIELDS);
@@ -178,8 +170,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.CONFIGURATION, value);
@@ -187,8 +177,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.CONFIGURATION);
@@ -210,8 +198,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.META_DATA, value);
@@ -219,8 +205,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.META_DATA);
@@ -228,8 +212,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.TYPE0, value);
@@ -237,8 +219,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.sqlserver.generatedclasses.tables.XUnused.X_UNUSED.TYPE0);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java
index 7a66312b3f..8de16215d9 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = 1648320716;
+	private static final long serialVersionUID = 211969324;
 
 	/**
 	 * An uncommented item
@@ -166,8 +166,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setClass_(java.lang.Integer value) {
 		setValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.CLASS, value);
@@ -175,8 +173,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.CLASS);
@@ -184,8 +180,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setFields_(java.lang.Integer value) {
 		setValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.FIELDS, value);
@@ -193,8 +187,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.FIELDS);
@@ -202,8 +194,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setConfiguration_(java.lang.Integer value) {
 		setValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.CONFIGURATION, value);
@@ -211,8 +201,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.CONFIGURATION);
@@ -234,8 +222,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setMetaData_(java.lang.Integer value) {
 		setValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.META_DATA, value);
@@ -243,8 +229,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.META_DATA);
@@ -252,8 +236,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public void setType0_(java.lang.Integer value) {
 		setValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.TYPE0, value);
@@ -261,8 +243,6 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 
 	/**
 	 * An uncommented item
-	 * 
-	 * This item causes a name clash. That is why an underline character was appended to the Java field name
 	 */
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED.TYPE0);