diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
index 298081fa64..d59822212e 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
@@ -120,6 +120,8 @@
             <deprecated>true</deprecated>
             <instanceFields>true</instanceFields>
             <generatedAnnotation>false</generatedAnnotation>
+            <pojos>true</pojos>
+            <jpaAnnotations>true</jpaAnnotations>
         </generate>
         <target>
             <packageName>org.jooq.test.oracle.generatedclasses</packageName>
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java
new file mode 100644
index 0000000000..47fd094810
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java
@@ -0,0 +1,76 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.multi_schema.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_AUTHOR", schema = "MULTI_SCHEMA")
+public class TAuthor implements java.io.Serializable {
+
+	private static final long serialVersionUID = 2090072774;
+
+	private java.lang.Integer id;
+	private java.lang.String  firstName;
+	private java.lang.String  lastName;
+	private java.sql.Date     dateOfBirth;
+	private java.lang.Integer yearOfBirth;
+	private java.lang.Object  address;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "FIRST_NAME")
+	public java.lang.String getFirstName() {
+		return this.firstName;
+	}
+
+	public void setFirstName(java.lang.String firstName) {
+		this.firstName = firstName;
+	}
+
+	@javax.persistence.Column(name = "LAST_NAME")
+	public java.lang.String getLastName() {
+		return this.lastName;
+	}
+
+	public void setLastName(java.lang.String lastName) {
+		this.lastName = lastName;
+	}
+
+	@javax.persistence.Column(name = "DATE_OF_BIRTH")
+	public java.sql.Date getDateOfBirth() {
+		return this.dateOfBirth;
+	}
+
+	public void setDateOfBirth(java.sql.Date dateOfBirth) {
+		this.dateOfBirth = dateOfBirth;
+	}
+
+	@javax.persistence.Column(name = "YEAR_OF_BIRTH")
+	public java.lang.Integer getYearOfBirth() {
+		return this.yearOfBirth;
+	}
+
+	public void setYearOfBirth(java.lang.Integer yearOfBirth) {
+		this.yearOfBirth = yearOfBirth;
+	}
+
+	@javax.persistence.Column(name = "ADDRESS")
+	public java.lang.Object getAddress() {
+		return this.address;
+	}
+
+	public void setAddress(java.lang.Object address) {
+		this.address = address;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java
new file mode 100644
index 0000000000..9fca5db9f5
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java
@@ -0,0 +1,106 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.multi_schema.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK", schema = "MULTI_SCHEMA")
+public class TBook implements java.io.Serializable {
+
+	private static final long serialVersionUID = -1817499674;
+
+	private java.lang.Integer                                          id;
+	private java.lang.Integer                                          authorId;
+	private java.lang.Integer                                          coAuthorId;
+	private java.lang.Integer                                          detailsId;
+	private java.lang.String                                           title;
+	private java.lang.Integer                                          publishedIn;
+	private org.jooq.test.oracle.generatedclasses.test.enums.TLanguage languageId;
+	private java.lang.String                                           contentText;
+	private byte[]                                                     contentPdf;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "AUTHOR_ID")
+	public java.lang.Integer getAuthorId() {
+		return this.authorId;
+	}
+
+	public void setAuthorId(java.lang.Integer authorId) {
+		this.authorId = authorId;
+	}
+
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
+	public java.lang.Integer getCoAuthorId() {
+		return this.coAuthorId;
+	}
+
+	public void setCoAuthorId(java.lang.Integer coAuthorId) {
+		this.coAuthorId = coAuthorId;
+	}
+
+	@javax.persistence.Column(name = "DETAILS_ID")
+	public java.lang.Integer getDetailsId() {
+		return this.detailsId;
+	}
+
+	public void setDetailsId(java.lang.Integer detailsId) {
+		this.detailsId = detailsId;
+	}
+
+	@javax.persistence.Column(name = "TITLE")
+	public java.lang.String getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(java.lang.String title) {
+		this.title = title;
+	}
+
+	@javax.persistence.Column(name = "PUBLISHED_IN")
+	public java.lang.Integer getPublishedIn() {
+		return this.publishedIn;
+	}
+
+	public void setPublishedIn(java.lang.Integer publishedIn) {
+		this.publishedIn = publishedIn;
+	}
+
+	@javax.persistence.Column(name = "LANGUAGE_ID")
+	public org.jooq.test.oracle.generatedclasses.test.enums.TLanguage getLanguageId() {
+		return this.languageId;
+	}
+
+	public void setLanguageId(org.jooq.test.oracle.generatedclasses.test.enums.TLanguage languageId) {
+		this.languageId = languageId;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_TEXT")
+	public java.lang.String getContentText() {
+		return this.contentText;
+	}
+
+	public void setContentText(java.lang.String contentText) {
+		this.contentText = contentText;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_PDF")
+	public byte[] getContentPdf() {
+		return this.contentPdf;
+	}
+
+	public void setContentPdf(byte[] contentPdf) {
+		this.contentPdf = contentPdf;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java
new file mode 100644
index 0000000000..48d2fb4e6f
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java
@@ -0,0 +1,66 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.multi_schema.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK_SALE", schema = "MULTI_SCHEMA")
+public class TBookSale implements java.io.Serializable {
+
+	private static final long serialVersionUID = -972600460;
+
+	private java.lang.Integer    id;
+	private java.lang.Integer    bookId;
+	private java.lang.String     bookStoreName;
+	private java.sql.Date        soldAt;
+	private java.math.BigDecimal soldFor;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "BOOK_ID")
+	public java.lang.Integer getBookId() {
+		return this.bookId;
+	}
+
+	public void setBookId(java.lang.Integer bookId) {
+		this.bookId = bookId;
+	}
+
+	@javax.persistence.Column(name = "BOOK_STORE_NAME")
+	public java.lang.String getBookStoreName() {
+		return this.bookStoreName;
+	}
+
+	public void setBookStoreName(java.lang.String bookStoreName) {
+		this.bookStoreName = bookStoreName;
+	}
+
+	@javax.persistence.Column(name = "SOLD_AT")
+	public java.sql.Date getSoldAt() {
+		return this.soldAt;
+	}
+
+	public void setSoldAt(java.sql.Date soldAt) {
+		this.soldAt = soldAt;
+	}
+
+	@javax.persistence.Column(name = "SOLD_FOR")
+	public java.math.BigDecimal getSoldFor() {
+		return this.soldFor;
+	}
+
+	public void setSoldFor(java.math.BigDecimal soldFor) {
+		this.soldFor = soldFor;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TAuthorRecord.java
index 09663cba0a..f33615f1fb 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TAuthorRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TAuthorRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.multi_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_AUTHOR", schema = "MULTI_SCHEMA")
 public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.multi_schema.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = -1384020730;
+	private static final long serialVersionUID = 1182084110;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TAuthor.T_AUTHOR.ID);
 	}
@@ -62,6 +66,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "FIRST_NAME")
 	public java.lang.String getFirstName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TAuthor.T_AUTHOR.FIRST_NAME);
 	}
@@ -76,6 +81,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "LAST_NAME")
 	public java.lang.String getLastName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TAuthor.T_AUTHOR.LAST_NAME);
 	}
@@ -90,6 +96,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "DATE_OF_BIRTH")
 	public java.sql.Date getDateOfBirth() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TAuthor.T_AUTHOR.DATE_OF_BIRTH);
 	}
@@ -104,6 +111,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "YEAR_OF_BIRTH")
 	public java.lang.Integer getYearOfBirth() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TAuthor.T_AUTHOR.YEAR_OF_BIRTH);
 	}
@@ -124,6 +132,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * The SQL type of this item (U_ADDRESS_TYPE) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "ADDRESS")
 	public java.lang.Object getAddress() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TAuthor.T_AUTHOR.ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookRecord.java
index 1963d1a0ae..1bd1514620 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.multi_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK", schema = "MULTI_SCHEMA")
 public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.multi_schema.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = 2073539442;
+	private static final long serialVersionUID = -717516514;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.ID);
 	}
@@ -50,6 +54,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * REFERENCES MULTI_SCHEMA.T_AUTHOR (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "AUTHOR_ID")
 	public java.lang.Integer getAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.AUTHOR_ID);
 	}
@@ -92,6 +97,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * REFERENCES MULTI_SCHEMA.T_AUTHOR (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
 	public java.lang.Integer getCoAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.CO_AUTHOR_ID);
 	}
@@ -122,6 +128,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "DETAILS_ID")
 	public java.lang.Integer getDetailsId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.DETAILS_ID);
 	}
@@ -136,6 +143,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TITLE")
 	public java.lang.String getTitle() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.TITLE);
 	}
@@ -150,6 +158,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "PUBLISHED_IN")
 	public java.lang.Integer getPublishedIn() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.PUBLISHED_IN);
 	}
@@ -176,6 +185,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * REFERENCES TEST.T_LANGUAGE (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "LANGUAGE_ID")
 	public org.jooq.test.oracle.generatedclasses.test.enums.TLanguage getLanguageId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.LANGUAGE_ID);
 	}
@@ -190,6 +200,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CONTENT_TEXT")
 	public java.lang.String getContentText() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.CONTENT_TEXT);
 	}
@@ -204,6 +215,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CONTENT_PDF")
 	public byte[] getContentPdf() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBook.T_BOOK.CONTENT_PDF);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookSaleRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookSaleRecord.java
index 03f309c2e1..04ecb9e9ae 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookSaleRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/records/TBookSaleRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.multi_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK_SALE", schema = "MULTI_SCHEMA")
 public class TBookSaleRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.multi_schema.tables.records.TBookSaleRecord> {
 
-	private static final long serialVersionUID = 439553191;
+	private static final long serialVersionUID = 1301568703;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TBookSaleRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBookSale.T_BOOK_SALE.ID);
 	}
@@ -50,6 +54,7 @@ public class TBookSaleRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	 * REFERENCES TEST.T_BOOK_TO_BOOK_STORE (BOOK_STORE_NAME, BOOK_ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "BOOK_ID")
 	public java.lang.Integer getBookId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBookSale.T_BOOK_SALE.BOOK_ID);
 	}
@@ -93,6 +98,7 @@ public class TBookSaleRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	 * REFERENCES TEST.T_BOOK_TO_BOOK_STORE (BOOK_STORE_NAME, BOOK_ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "BOOK_STORE_NAME")
 	public java.lang.String getBookStoreName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBookSale.T_BOOK_SALE.BOOK_STORE_NAME);
 	}
@@ -107,6 +113,7 @@ public class TBookSaleRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "SOLD_AT")
 	public java.sql.Date getSoldAt() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBookSale.T_BOOK_SALE.SOLD_AT);
 	}
@@ -121,6 +128,7 @@ public class TBookSaleRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "SOLD_FOR")
 	public java.math.BigDecimal getSoldFor() {
 		return getValue(org.jooq.test.oracle.generatedclasses.multi_schema.tables.TBookSale.T_BOOK_SALE.SOLD_FOR);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java
new file mode 100644
index 0000000000..e60e3e9cbb
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java
@@ -0,0 +1,66 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_ARRAYS", schema = "TEST")
+public class TArrays implements java.io.Serializable {
+
+	private static final long serialVersionUID = -1863679406;
+
+	private java.lang.Integer                                                             id;
+	private org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord     stringArray;
+	private org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord     numberArray;
+	private org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord numberLongArray;
+	private org.jooq.test.oracle.generatedclasses.test.udt.records.UDateArrayRecord       dateArray;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "STRING_ARRAY")
+	public org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord getStringArray() {
+		return this.stringArray;
+	}
+
+	public void setStringArray(org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord stringArray) {
+		this.stringArray = stringArray;
+	}
+
+	@javax.persistence.Column(name = "NUMBER_ARRAY")
+	public org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord getNumberArray() {
+		return this.numberArray;
+	}
+
+	public void setNumberArray(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord numberArray) {
+		this.numberArray = numberArray;
+	}
+
+	@javax.persistence.Column(name = "NUMBER_LONG_ARRAY")
+	public org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord getNumberLongArray() {
+		return this.numberLongArray;
+	}
+
+	public void setNumberLongArray(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord numberLongArray) {
+		this.numberLongArray = numberLongArray;
+	}
+
+	@javax.persistence.Column(name = "DATE_ARRAY")
+	public org.jooq.test.oracle.generatedclasses.test.udt.records.UDateArrayRecord getDateArray() {
+		return this.dateArray;
+	}
+
+	public void setDateArray(org.jooq.test.oracle.generatedclasses.test.udt.records.UDateArrayRecord dateArray) {
+		this.dateArray = dateArray;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java
new file mode 100644
index 0000000000..a8002b3508
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java
@@ -0,0 +1,78 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * An entity holding authors of books
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_AUTHOR", schema = "TEST")
+public class TAuthor implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1965403076;
+
+	private java.lang.Integer                                                         id;
+	private java.lang.String                                                          firstName;
+	private java.lang.String                                                          lastName;
+	private java.sql.Date                                                             dateOfBirth;
+	private java.lang.Integer                                                         yearOfBirth;
+	private org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord address;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "FIRST_NAME")
+	public java.lang.String getFirstName() {
+		return this.firstName;
+	}
+
+	public void setFirstName(java.lang.String firstName) {
+		this.firstName = firstName;
+	}
+
+	@javax.persistence.Column(name = "LAST_NAME")
+	public java.lang.String getLastName() {
+		return this.lastName;
+	}
+
+	public void setLastName(java.lang.String lastName) {
+		this.lastName = lastName;
+	}
+
+	@javax.persistence.Column(name = "DATE_OF_BIRTH")
+	public java.sql.Date getDateOfBirth() {
+		return this.dateOfBirth;
+	}
+
+	public void setDateOfBirth(java.sql.Date dateOfBirth) {
+		this.dateOfBirth = dateOfBirth;
+	}
+
+	@javax.persistence.Column(name = "YEAR_OF_BIRTH")
+	public java.lang.Integer getYearOfBirth() {
+		return this.yearOfBirth;
+	}
+
+	public void setYearOfBirth(java.lang.Integer yearOfBirth) {
+		this.yearOfBirth = yearOfBirth;
+	}
+
+	@javax.persistence.Column(name = "ADDRESS")
+	public org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord getAddress() {
+		return this.address;
+	}
+
+	public void setAddress(org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord address) {
+		this.address = address;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java
new file mode 100644
index 0000000000..a1cdcf94d4
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java
@@ -0,0 +1,108 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * An entity holding books
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK", schema = "TEST")
+public class TBook implements java.io.Serializable {
+
+	private static final long serialVersionUID = 135246163;
+
+	private java.lang.Integer                                          id;
+	private java.lang.Integer                                          authorId;
+	private java.lang.Integer                                          coAuthorId;
+	private java.lang.Integer                                          detailsId;
+	private java.lang.String                                           title;
+	private java.lang.Integer                                          publishedIn;
+	private org.jooq.test.oracle.generatedclasses.test.enums.TLanguage languageId;
+	private java.lang.String                                           contentText;
+	private byte[]                                                     contentPdf;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "AUTHOR_ID")
+	public java.lang.Integer getAuthorId() {
+		return this.authorId;
+	}
+
+	public void setAuthorId(java.lang.Integer authorId) {
+		this.authorId = authorId;
+	}
+
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
+	public java.lang.Integer getCoAuthorId() {
+		return this.coAuthorId;
+	}
+
+	public void setCoAuthorId(java.lang.Integer coAuthorId) {
+		this.coAuthorId = coAuthorId;
+	}
+
+	@javax.persistence.Column(name = "DETAILS_ID")
+	public java.lang.Integer getDetailsId() {
+		return this.detailsId;
+	}
+
+	public void setDetailsId(java.lang.Integer detailsId) {
+		this.detailsId = detailsId;
+	}
+
+	@javax.persistence.Column(name = "TITLE")
+	public java.lang.String getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(java.lang.String title) {
+		this.title = title;
+	}
+
+	@javax.persistence.Column(name = "PUBLISHED_IN")
+	public java.lang.Integer getPublishedIn() {
+		return this.publishedIn;
+	}
+
+	public void setPublishedIn(java.lang.Integer publishedIn) {
+		this.publishedIn = publishedIn;
+	}
+
+	@javax.persistence.Column(name = "LANGUAGE_ID")
+	public org.jooq.test.oracle.generatedclasses.test.enums.TLanguage getLanguageId() {
+		return this.languageId;
+	}
+
+	public void setLanguageId(org.jooq.test.oracle.generatedclasses.test.enums.TLanguage languageId) {
+		this.languageId = languageId;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_TEXT")
+	public java.lang.String getContentText() {
+		return this.contentText;
+	}
+
+	public void setContentText(java.lang.String contentText) {
+		this.contentText = contentText;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_PDF")
+	public byte[] getContentPdf() {
+		return this.contentPdf;
+	}
+
+	public void setContentPdf(byte[] contentPdf) {
+		this.contentPdf = contentPdf;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java
new file mode 100644
index 0000000000..d86266d01a
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java
@@ -0,0 +1,27 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * A book store
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK_STORE", schema = "TEST")
+public class TBookStore implements java.io.Serializable {
+
+	private static final long serialVersionUID = -700225932;
+
+	private java.lang.String name;
+
+	@javax.persistence.Column(name = "NAME", unique = true)
+	public java.lang.String getName() {
+		return this.name;
+	}
+
+	public void setName(java.lang.String name) {
+		this.name = name;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java
new file mode 100644
index 0000000000..01643a41a0
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java
@@ -0,0 +1,49 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * An m:n relation between books and book stores
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK_TO_BOOK_STORE", schema = "TEST", uniqueConstraints = {
+	@javax.persistence.UniqueConstraint(columnNames = {"BOOK_STORE_NAME", "BOOK_ID"})
+})
+public class TBookToBookStore implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1943372630;
+
+	private java.lang.String  bookStoreName;
+	private java.lang.Integer bookId;
+	private java.lang.Integer stock;
+
+	@javax.persistence.Column(name = "BOOK_STORE_NAME")
+	public java.lang.String getBookStoreName() {
+		return this.bookStoreName;
+	}
+
+	public void setBookStoreName(java.lang.String bookStoreName) {
+		this.bookStoreName = bookStoreName;
+	}
+
+	@javax.persistence.Column(name = "BOOK_ID")
+	public java.lang.Integer getBookId() {
+		return this.bookId;
+	}
+
+	public void setBookId(java.lang.Integer bookId) {
+		this.bookId = bookId;
+	}
+
+	@javax.persistence.Column(name = "STOCK")
+	public java.lang.Integer getStock() {
+		return this.stock;
+	}
+
+	public void setStock(java.lang.Integer stock) {
+		this.stock = stock;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java
new file mode 100644
index 0000000000..d9043e8566
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java
@@ -0,0 +1,126 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOLEANS", schema = "TEST")
+public class TBooleans implements java.io.Serializable {
+
+	private static final long serialVersionUID = -282252705;
+
+	private java.lang.Integer                                                   id;
+	private org.jooq.test.oracle.generatedclasses.test.enums.Boolean_10         oneZero;
+	private org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseLc trueFalseLc;
+	private org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseUc trueFalseUc;
+	private org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoLc     yesNoLc;
+	private org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoUc     yesNoUc;
+	private org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnLc        yNLc;
+	private org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnUc        yNUc;
+	private java.lang.Boolean                                                   vcBoolean;
+	private java.lang.Boolean                                                   cBoolean;
+	private java.lang.Boolean                                                   nBoolean;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "ONE_ZERO")
+	public org.jooq.test.oracle.generatedclasses.test.enums.Boolean_10 getOneZero() {
+		return this.oneZero;
+	}
+
+	public void setOneZero(org.jooq.test.oracle.generatedclasses.test.enums.Boolean_10 oneZero) {
+		this.oneZero = oneZero;
+	}
+
+	@javax.persistence.Column(name = "TRUE_FALSE_LC")
+	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseLc getTrueFalseLc() {
+		return this.trueFalseLc;
+	}
+
+	public void setTrueFalseLc(org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseLc trueFalseLc) {
+		this.trueFalseLc = trueFalseLc;
+	}
+
+	@javax.persistence.Column(name = "TRUE_FALSE_UC")
+	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseUc getTrueFalseUc() {
+		return this.trueFalseUc;
+	}
+
+	public void setTrueFalseUc(org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseUc trueFalseUc) {
+		this.trueFalseUc = trueFalseUc;
+	}
+
+	@javax.persistence.Column(name = "YES_NO_LC")
+	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoLc getYesNoLc() {
+		return this.yesNoLc;
+	}
+
+	public void setYesNoLc(org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoLc yesNoLc) {
+		this.yesNoLc = yesNoLc;
+	}
+
+	@javax.persistence.Column(name = "YES_NO_UC")
+	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoUc getYesNoUc() {
+		return this.yesNoUc;
+	}
+
+	public void setYesNoUc(org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoUc yesNoUc) {
+		this.yesNoUc = yesNoUc;
+	}
+
+	@javax.persistence.Column(name = "Y_N_LC")
+	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnLc getYNLc() {
+		return this.yNLc;
+	}
+
+	public void setYNLc(org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnLc yNLc) {
+		this.yNLc = yNLc;
+	}
+
+	@javax.persistence.Column(name = "Y_N_UC")
+	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnUc getYNUc() {
+		return this.yNUc;
+	}
+
+	public void setYNUc(org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnUc yNUc) {
+		this.yNUc = yNUc;
+	}
+
+	@javax.persistence.Column(name = "VC_BOOLEAN")
+	public java.lang.Boolean getVcBoolean() {
+		return this.vcBoolean;
+	}
+
+	public void setVcBoolean(java.lang.Boolean vcBoolean) {
+		this.vcBoolean = vcBoolean;
+	}
+
+	@javax.persistence.Column(name = "C_BOOLEAN")
+	public java.lang.Boolean getCBoolean() {
+		return this.cBoolean;
+	}
+
+	public void setCBoolean(java.lang.Boolean cBoolean) {
+		this.cBoolean = cBoolean;
+	}
+
+	@javax.persistence.Column(name = "N_BOOLEAN")
+	public java.lang.Boolean getNBoolean() {
+		return this.nBoolean;
+	}
+
+	public void setNBoolean(java.lang.Boolean nBoolean) {
+		this.nBoolean = nBoolean;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java
new file mode 100644
index 0000000000..4c0eec9cde
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java
@@ -0,0 +1,76 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_DATES", schema = "TEST")
+public class TDates implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1831637425;
+
+	private java.lang.Integer  id;
+	private java.sql.Date      d;
+	private java.sql.Timestamp t;
+	private java.sql.Timestamp ts;
+	private java.lang.Integer  dInt;
+	private java.lang.Long     tsBigint;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "D")
+	public java.sql.Date getD() {
+		return this.d;
+	}
+
+	public void setD(java.sql.Date d) {
+		this.d = d;
+	}
+
+	@javax.persistence.Column(name = "T")
+	public java.sql.Timestamp getT() {
+		return this.t;
+	}
+
+	public void setT(java.sql.Timestamp t) {
+		this.t = t;
+	}
+
+	@javax.persistence.Column(name = "TS")
+	public java.sql.Timestamp getTs() {
+		return this.ts;
+	}
+
+	public void setTs(java.sql.Timestamp ts) {
+		this.ts = ts;
+	}
+
+	@javax.persistence.Column(name = "D_INT")
+	public java.lang.Integer getDInt() {
+		return this.dInt;
+	}
+
+	public void setDInt(java.lang.Integer dInt) {
+		this.dInt = dInt;
+	}
+
+	@javax.persistence.Column(name = "TS_BIGINT")
+	public java.lang.Long getTsBigint() {
+		return this.tsBigint;
+	}
+
+	public void setTsBigint(java.lang.Long tsBigint) {
+		this.tsBigint = tsBigint;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java
new file mode 100644
index 0000000000..ce17eadfbb
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java
@@ -0,0 +1,56 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_DIRECTORY", schema = "TEST")
+public class TDirectory implements java.io.Serializable {
+
+	private static final long serialVersionUID = -2037706638;
+
+	private java.lang.Integer id;
+	private java.lang.Integer parentId;
+	private java.lang.Byte    isDirectory;
+	private java.lang.String  name;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "PARENT_ID")
+	public java.lang.Integer getParentId() {
+		return this.parentId;
+	}
+
+	public void setParentId(java.lang.Integer parentId) {
+		this.parentId = parentId;
+	}
+
+	@javax.persistence.Column(name = "IS_DIRECTORY")
+	public java.lang.Byte getIsDirectory() {
+		return this.isDirectory;
+	}
+
+	public void setIsDirectory(java.lang.Byte isDirectory) {
+		this.isDirectory = isDirectory;
+	}
+
+	@javax.persistence.Column(name = "name")
+	public java.lang.String getName() {
+		return this.name;
+	}
+
+	public void setName(java.lang.String name) {
+		this.name = name;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java
new file mode 100644
index 0000000000..2e2f614d40
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java
@@ -0,0 +1,46 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_TRIGGERS", schema = "TEST")
+public class TTriggers implements java.io.Serializable {
+
+	private static final long serialVersionUID = -1426952981;
+
+	private java.lang.Integer idGenerated;
+	private java.lang.Integer id;
+	private java.lang.Integer counter;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID_GENERATED", unique = true)
+	public java.lang.Integer getIdGenerated() {
+		return this.idGenerated;
+	}
+
+	public void setIdGenerated(java.lang.Integer idGenerated) {
+		this.idGenerated = idGenerated;
+	}
+
+	@javax.persistence.Column(name = "ID")
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "COUNTER")
+	public java.lang.Integer getCounter() {
+		return this.counter;
+	}
+
+	public void setCounter(java.lang.Integer counter) {
+		this.counter = counter;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java
new file mode 100644
index 0000000000..539397818e
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java
@@ -0,0 +1,126 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_639_NUMBERS_TABLE", schema = "TEST")
+public class T_639NumbersTable implements java.io.Serializable {
+
+	private static final long serialVersionUID = -980355535;
+
+	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.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;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "BYTE")
+	public java.lang.Byte getByte() {
+		return this.byte_;
+	}
+
+	public void setByte(java.lang.Byte byte_) {
+		this.byte_ = byte_;
+	}
+
+	@javax.persistence.Column(name = "SHORT")
+	public java.lang.Short getShort() {
+		return this.short_;
+	}
+
+	public void setShort(java.lang.Short short_) {
+		this.short_ = short_;
+	}
+
+	@javax.persistence.Column(name = "INTEGER")
+	public java.lang.Integer getInteger() {
+		return this.integer;
+	}
+
+	public void setInteger(java.lang.Integer integer) {
+		this.integer = integer;
+	}
+
+	@javax.persistence.Column(name = "LONG")
+	public java.lang.Long getLong() {
+		return this.long_;
+	}
+
+	public void setLong(java.lang.Long long_) {
+		this.long_ = long_;
+	}
+
+	@javax.persistence.Column(name = "BYTE_DECIMAL")
+	public java.lang.Byte getByteDecimal() {
+		return this.byteDecimal;
+	}
+
+	public void setByteDecimal(java.lang.Byte byteDecimal) {
+		this.byteDecimal = byteDecimal;
+	}
+
+	@javax.persistence.Column(name = "SHORT_DECIMAL")
+	public java.lang.Short getShortDecimal() {
+		return this.shortDecimal;
+	}
+
+	public void setShortDecimal(java.lang.Short shortDecimal) {
+		this.shortDecimal = shortDecimal;
+	}
+
+	@javax.persistence.Column(name = "INTEGER_DECIMAL")
+	public java.lang.Integer getIntegerDecimal() {
+		return this.integerDecimal;
+	}
+
+	public void setIntegerDecimal(java.lang.Integer integerDecimal) {
+		this.integerDecimal = integerDecimal;
+	}
+
+	@javax.persistence.Column(name = "LONG_DECIMAL")
+	public java.lang.Long getLongDecimal() {
+		return this.longDecimal;
+	}
+
+	public void setLongDecimal(java.lang.Long longDecimal) {
+		this.longDecimal = longDecimal;
+	}
+
+	@javax.persistence.Column(name = "BIG_INTEGER")
+	public java.math.BigInteger getBigInteger() {
+		return this.bigInteger;
+	}
+
+	public void setBigInteger(java.math.BigInteger bigInteger) {
+		this.bigInteger = bigInteger;
+	}
+
+	@javax.persistence.Column(name = "BIG_DECIMAL")
+	public java.math.BigDecimal getBigDecimal() {
+		return this.bigDecimal;
+	}
+
+	public void setBigDecimal(java.math.BigDecimal bigDecimal) {
+		this.bigDecimal = bigDecimal;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_658Ref.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_658Ref.java
new file mode 100644
index 0000000000..cce52c8147
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_658Ref.java
@@ -0,0 +1,75 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_658_REF", schema = "TEST")
+public class T_658Ref implements java.io.Serializable {
+
+	private static final long serialVersionUID = -304476053;
+
+	private org.jooq.test.oracle.generatedclasses.test.enums.T_658_11 ref_11;
+	private org.jooq.test.oracle.generatedclasses.test.enums.T_658_21 ref_21;
+	private org.jooq.test.oracle.generatedclasses.test.enums.T_658_31 ref_31;
+	private org.jooq.test.oracle.generatedclasses.test.enums.T_658_12 ref_12;
+	private org.jooq.test.oracle.generatedclasses.test.enums.T_658_22 ref_22;
+	private org.jooq.test.oracle.generatedclasses.test.enums.T_658_32 ref_32;
+
+	@javax.persistence.Column(name = "REF_11")
+	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_11 getRef_11() {
+		return this.ref_11;
+	}
+
+	public void setRef_11(org.jooq.test.oracle.generatedclasses.test.enums.T_658_11 ref_11) {
+		this.ref_11 = ref_11;
+	}
+
+	@javax.persistence.Column(name = "REF_21")
+	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_21 getRef_21() {
+		return this.ref_21;
+	}
+
+	public void setRef_21(org.jooq.test.oracle.generatedclasses.test.enums.T_658_21 ref_21) {
+		this.ref_21 = ref_21;
+	}
+
+	@javax.persistence.Column(name = "REF_31")
+	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_31 getRef_31() {
+		return this.ref_31;
+	}
+
+	public void setRef_31(org.jooq.test.oracle.generatedclasses.test.enums.T_658_31 ref_31) {
+		this.ref_31 = ref_31;
+	}
+
+	@javax.persistence.Column(name = "REF_12")
+	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_12 getRef_12() {
+		return this.ref_12;
+	}
+
+	public void setRef_12(org.jooq.test.oracle.generatedclasses.test.enums.T_658_12 ref_12) {
+		this.ref_12 = ref_12;
+	}
+
+	@javax.persistence.Column(name = "REF_22")
+	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_22 getRef_22() {
+		return this.ref_22;
+	}
+
+	public void setRef_22(org.jooq.test.oracle.generatedclasses.test.enums.T_658_22 ref_22) {
+		this.ref_22 = ref_22;
+	}
+
+	@javax.persistence.Column(name = "REF_32")
+	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_32 getRef_32() {
+		return this.ref_32;
+	}
+
+	public void setRef_32(org.jooq.test.oracle.generatedclasses.test.enums.T_658_32 ref_32) {
+		this.ref_32 = ref_32;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java
new file mode 100644
index 0000000000..0e93c90965
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java
@@ -0,0 +1,36 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_725_LOB_TEST", schema = "TEST")
+public class T_725LobTest implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1398038258;
+
+	private java.lang.Integer id;
+	private byte[]            lob;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "LOB")
+	public byte[] getLob() {
+		return this.lob;
+	}
+
+	public void setLob(byte[] lob) {
+		this.lob = lob;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java
new file mode 100644
index 0000000000..a8a5c63c2b
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java
@@ -0,0 +1,45 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_785", schema = "TEST")
+public class T_785 implements java.io.Serializable {
+
+	private static final long serialVersionUID = 425414156;
+
+	private java.lang.Integer id;
+	private java.lang.String  name;
+	private java.lang.String  value;
+
+	@javax.persistence.Column(name = "ID")
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "NAME")
+	public java.lang.String getName() {
+		return this.name;
+	}
+
+	public void setName(java.lang.String name) {
+		this.name = name;
+	}
+
+	@javax.persistence.Column(name = "VALUE")
+	public java.lang.String getValue() {
+		return this.value;
+	}
+
+	public void setValue(java.lang.String value) {
+		this.value = value;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java
new file mode 100644
index 0000000000..a2fc1f99b0
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java
@@ -0,0 +1,75 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_AUTHOR", schema = "TEST")
+public class VAuthor implements java.io.Serializable {
+
+	private static final long serialVersionUID = -501116575;
+
+	private java.lang.Integer                                                         id;
+	private java.lang.String                                                          firstName;
+	private java.lang.String                                                          lastName;
+	private java.sql.Date                                                             dateOfBirth;
+	private java.lang.Integer                                                         yearOfBirth;
+	private org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord address;
+
+	@javax.persistence.Column(name = "ID")
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "FIRST_NAME")
+	public java.lang.String getFirstName() {
+		return this.firstName;
+	}
+
+	public void setFirstName(java.lang.String firstName) {
+		this.firstName = firstName;
+	}
+
+	@javax.persistence.Column(name = "LAST_NAME")
+	public java.lang.String getLastName() {
+		return this.lastName;
+	}
+
+	public void setLastName(java.lang.String lastName) {
+		this.lastName = lastName;
+	}
+
+	@javax.persistence.Column(name = "DATE_OF_BIRTH")
+	public java.sql.Date getDateOfBirth() {
+		return this.dateOfBirth;
+	}
+
+	public void setDateOfBirth(java.sql.Date dateOfBirth) {
+		this.dateOfBirth = dateOfBirth;
+	}
+
+	@javax.persistence.Column(name = "YEAR_OF_BIRTH")
+	public java.lang.Integer getYearOfBirth() {
+		return this.yearOfBirth;
+	}
+
+	public void setYearOfBirth(java.lang.Integer yearOfBirth) {
+		this.yearOfBirth = yearOfBirth;
+	}
+
+	@javax.persistence.Column(name = "ADDRESS")
+	public org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord getAddress() {
+		return this.address;
+	}
+
+	public void setAddress(org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord address) {
+		this.address = address;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java
new file mode 100644
index 0000000000..333535305f
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java
@@ -0,0 +1,105 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_BOOK", schema = "TEST")
+public class VBook implements java.io.Serializable {
+
+	private static final long serialVersionUID = -1791159149;
+
+	private java.lang.Integer id;
+	private java.lang.Integer authorId;
+	private java.lang.Integer coAuthorId;
+	private java.lang.Integer detailsId;
+	private java.lang.String  title;
+	private java.lang.Integer publishedIn;
+	private java.lang.Integer languageId;
+	private java.lang.String  contentText;
+	private byte[]            contentPdf;
+
+	@javax.persistence.Column(name = "ID")
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "AUTHOR_ID")
+	public java.lang.Integer getAuthorId() {
+		return this.authorId;
+	}
+
+	public void setAuthorId(java.lang.Integer authorId) {
+		this.authorId = authorId;
+	}
+
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
+	public java.lang.Integer getCoAuthorId() {
+		return this.coAuthorId;
+	}
+
+	public void setCoAuthorId(java.lang.Integer coAuthorId) {
+		this.coAuthorId = coAuthorId;
+	}
+
+	@javax.persistence.Column(name = "DETAILS_ID")
+	public java.lang.Integer getDetailsId() {
+		return this.detailsId;
+	}
+
+	public void setDetailsId(java.lang.Integer detailsId) {
+		this.detailsId = detailsId;
+	}
+
+	@javax.persistence.Column(name = "TITLE")
+	public java.lang.String getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(java.lang.String title) {
+		this.title = title;
+	}
+
+	@javax.persistence.Column(name = "PUBLISHED_IN")
+	public java.lang.Integer getPublishedIn() {
+		return this.publishedIn;
+	}
+
+	public void setPublishedIn(java.lang.Integer publishedIn) {
+		this.publishedIn = publishedIn;
+	}
+
+	@javax.persistence.Column(name = "LANGUAGE_ID")
+	public java.lang.Integer getLanguageId() {
+		return this.languageId;
+	}
+
+	public void setLanguageId(java.lang.Integer languageId) {
+		this.languageId = languageId;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_TEXT")
+	public java.lang.String getContentText() {
+		return this.contentText;
+	}
+
+	public void setContentText(java.lang.String contentText) {
+		this.contentText = contentText;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_PDF")
+	public byte[] getContentPdf() {
+		return this.contentPdf;
+	}
+
+	public void setContentPdf(byte[] contentPdf) {
+		this.contentPdf = contentPdf;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VIncomplete.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VIncomplete.java
new file mode 100644
index 0000000000..aab227c676
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VIncomplete.java
@@ -0,0 +1,105 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_INCOMPLETE", schema = "TEST")
+public class VIncomplete implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1342907548;
+
+	private java.lang.Object id;
+	private java.lang.Object authorId;
+	private java.lang.Object coAuthorId;
+	private java.lang.Object detailsId;
+	private java.lang.Object title;
+	private java.lang.Object publishedIn;
+	private java.lang.Object languageId;
+	private java.lang.Object contentText;
+	private java.lang.Object contentPdf;
+
+	@javax.persistence.Column(name = "ID")
+	public java.lang.Object getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Object id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "AUTHOR_ID")
+	public java.lang.Object getAuthorId() {
+		return this.authorId;
+	}
+
+	public void setAuthorId(java.lang.Object authorId) {
+		this.authorId = authorId;
+	}
+
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
+	public java.lang.Object getCoAuthorId() {
+		return this.coAuthorId;
+	}
+
+	public void setCoAuthorId(java.lang.Object coAuthorId) {
+		this.coAuthorId = coAuthorId;
+	}
+
+	@javax.persistence.Column(name = "DETAILS_ID")
+	public java.lang.Object getDetailsId() {
+		return this.detailsId;
+	}
+
+	public void setDetailsId(java.lang.Object detailsId) {
+		this.detailsId = detailsId;
+	}
+
+	@javax.persistence.Column(name = "TITLE")
+	public java.lang.Object getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(java.lang.Object title) {
+		this.title = title;
+	}
+
+	@javax.persistence.Column(name = "PUBLISHED_IN")
+	public java.lang.Object getPublishedIn() {
+		return this.publishedIn;
+	}
+
+	public void setPublishedIn(java.lang.Object publishedIn) {
+		this.publishedIn = publishedIn;
+	}
+
+	@javax.persistence.Column(name = "LANGUAGE_ID")
+	public java.lang.Object getLanguageId() {
+		return this.languageId;
+	}
+
+	public void setLanguageId(java.lang.Object languageId) {
+		this.languageId = languageId;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_TEXT")
+	public java.lang.Object getContentText() {
+		return this.contentText;
+	}
+
+	public void setContentText(java.lang.Object contentText) {
+		this.contentText = contentText;
+	}
+
+	@javax.persistence.Column(name = "CONTENT_PDF")
+	public java.lang.Object getContentPdf() {
+		return this.contentPdf;
+	}
+
+	public void setContentPdf(java.lang.Object contentPdf) {
+		this.contentPdf = contentPdf;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java
new file mode 100644
index 0000000000..a8d70adfa8
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java
@@ -0,0 +1,35 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_LIBRARY", schema = "TEST")
+public class VLibrary implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1483005068;
+
+	private java.lang.String author;
+	private java.lang.String title;
+
+	@javax.persistence.Column(name = "AUTHOR")
+	public java.lang.String getAuthor() {
+		return this.author;
+	}
+
+	public void setAuthor(java.lang.String author) {
+		this.author = author;
+	}
+
+	@javax.persistence.Column(name = "TITLE")
+	public java.lang.String getTitle() {
+		return this.title;
+	}
+
+	public void setTitle(java.lang.String title) {
+		this.title = title;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java
new file mode 100644
index 0000000000..32b3ed8dd1
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java
@@ -0,0 +1,36 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_TEST_CASE_64_69", schema = "TEST")
+public class XTestCase_64_69 implements java.io.Serializable {
+
+	private static final long serialVersionUID = -2105886119;
+
+	private java.lang.Integer id;
+	private java.lang.Integer unusedId;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "UNUSED_ID")
+	public java.lang.Integer getUnusedId() {
+		return this.unusedId;
+	}
+
+	public void setUnusedId(java.lang.Integer unusedId) {
+		this.unusedId = unusedId;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java
new file mode 100644
index 0000000000..9d21ac5336
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java
@@ -0,0 +1,36 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_TEST_CASE_71", schema = "TEST")
+public class XTestCase_71 implements java.io.Serializable {
+
+	private static final long serialVersionUID = 294429786;
+
+	private java.lang.Integer id;
+	private java.lang.Short   testCase_64_69Id;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "TEST_CASE_64_69_ID")
+	public java.lang.Short getTestCase_64_69Id() {
+		return this.testCase_64_69Id;
+	}
+
+	public void setTestCase_64_69Id(java.lang.Short testCase_64_69Id) {
+		this.testCase_64_69Id = testCase_64_69Id;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java
new file mode 100644
index 0000000000..41e317cb90
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java
@@ -0,0 +1,46 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_TEST_CASE_85", schema = "TEST")
+public class XTestCase_85 implements java.io.Serializable {
+
+	private static final long serialVersionUID = -1094438970;
+
+	private java.lang.Integer id;
+	private java.lang.Integer xUnusedId;
+	private java.lang.String  xUnusedName;
+
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "X_UNUSED_ID")
+	public java.lang.Integer getXUnusedId() {
+		return this.xUnusedId;
+	}
+
+	public void setXUnusedId(java.lang.Integer xUnusedId) {
+		this.xUnusedId = xUnusedId;
+	}
+
+	@javax.persistence.Column(name = "X_UNUSED_NAME")
+	public java.lang.String getXUnusedName() {
+		return this.xUnusedName;
+	}
+
+	public void setXUnusedName(java.lang.String xUnusedName) {
+		this.xUnusedName = xUnusedName;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java
new file mode 100644
index 0000000000..843468697e
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java
@@ -0,0 +1,179 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * An unused table in the same schema.
+ */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_UNUSED", schema = "TEST", uniqueConstraints = {
+	@javax.persistence.UniqueConstraint(columnNames = {"ID", "NAME"})
+})
+public class XUnused implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1983954313;
+
+	private java.lang.Integer    id;
+	private java.lang.String     name;
+	private java.math.BigInteger bigInteger;
+	private java.lang.Integer    idRef;
+	private java.lang.Integer    class_;
+	private java.lang.Integer    fields;
+	private java.lang.Integer    configuration;
+	private java.lang.Integer    uDT;
+	private java.lang.Integer    metaData;
+	private java.lang.Integer    type0;
+	private java.lang.Integer    primaryKey;
+	private java.lang.Integer    primarykey;
+	private java.lang.String     nameRef;
+	private java.math.BigDecimal field_737;
+	private java.lang.Integer    msUnusedIdRef;
+	private java.lang.String     msUnusedNameRef;
+
+	@javax.persistence.Column(name = "ID", unique = true)
+	public java.lang.Integer getId() {
+		return this.id;
+	}
+
+	public void setId(java.lang.Integer id) {
+		this.id = id;
+	}
+
+	@javax.persistence.Column(name = "NAME")
+	public java.lang.String getName() {
+		return this.name;
+	}
+
+	public void setName(java.lang.String name) {
+		this.name = name;
+	}
+
+	@javax.persistence.Column(name = "BIG_INTEGER")
+	public java.math.BigInteger getBigInteger() {
+		return this.bigInteger;
+	}
+
+	public void setBigInteger(java.math.BigInteger bigInteger) {
+		this.bigInteger = bigInteger;
+	}
+
+	@javax.persistence.Column(name = "ID_REF")
+	public java.lang.Integer getIdRef() {
+		return this.idRef;
+	}
+
+	public void setIdRef(java.lang.Integer idRef) {
+		this.idRef = idRef;
+	}
+
+	@javax.persistence.Column(name = "CLASS")
+	public java.lang.Integer getClass_() {
+		return this.class_;
+	}
+
+	public void setClass_(java.lang.Integer class_) {
+		this.class_ = class_;
+	}
+
+	@javax.persistence.Column(name = "FIELDS")
+	public java.lang.Integer getFields_() {
+		return this.fields;
+	}
+
+	public void setFields_(java.lang.Integer fields) {
+		this.fields = fields;
+	}
+
+	@javax.persistence.Column(name = "CONFIGURATION")
+	public java.lang.Integer getConfiguration_() {
+		return this.configuration;
+	}
+
+	public void setConfiguration_(java.lang.Integer configuration) {
+		this.configuration = configuration;
+	}
+
+	@javax.persistence.Column(name = "U_D_T")
+	public java.lang.Integer getUDT() {
+		return this.uDT;
+	}
+
+	public void setUDT(java.lang.Integer uDT) {
+		this.uDT = uDT;
+	}
+
+	@javax.persistence.Column(name = "META_DATA")
+	public java.lang.Integer getMetaData_() {
+		return this.metaData;
+	}
+
+	public void setMetaData_(java.lang.Integer metaData) {
+		this.metaData = metaData;
+	}
+
+	@javax.persistence.Column(name = "TYPE0")
+	public java.lang.Integer getType0_() {
+		return this.type0;
+	}
+
+	public void setType0_(java.lang.Integer type0) {
+		this.type0 = type0;
+	}
+
+	@javax.persistence.Column(name = "PRIMARY_KEY")
+	public java.lang.Integer getPrimaryKey() {
+		return this.primaryKey;
+	}
+
+	public void setPrimaryKey(java.lang.Integer primaryKey) {
+		this.primaryKey = primaryKey;
+	}
+
+	@javax.persistence.Column(name = "PRIMARYKEY")
+	public java.lang.Integer getPrimarykey() {
+		return this.primarykey;
+	}
+
+	public void setPrimarykey(java.lang.Integer primarykey) {
+		this.primarykey = primarykey;
+	}
+
+	@javax.persistence.Column(name = "NAME_REF")
+	public java.lang.String getNameRef() {
+		return this.nameRef;
+	}
+
+	public void setNameRef(java.lang.String nameRef) {
+		this.nameRef = nameRef;
+	}
+
+	@javax.persistence.Column(name = "FIELD 737")
+	public java.math.BigDecimal getField_737() {
+		return this.field_737;
+	}
+
+	public void setField_737(java.math.BigDecimal field_737) {
+		this.field_737 = field_737;
+	}
+
+	@javax.persistence.Column(name = "MS_UNUSED_ID_REF")
+	public java.lang.Integer getMsUnusedIdRef() {
+		return this.msUnusedIdRef;
+	}
+
+	public void setMsUnusedIdRef(java.lang.Integer msUnusedIdRef) {
+		this.msUnusedIdRef = msUnusedIdRef;
+	}
+
+	@javax.persistence.Column(name = "MS_UNUSED_NAME_REF")
+	public java.lang.String getMsUnusedNameRef() {
+		return this.msUnusedNameRef;
+	}
+
+	public void setMsUnusedNameRef(java.lang.String msUnusedNameRef) {
+		this.msUnusedNameRef = msUnusedNameRef;
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TArraysRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TArraysRecord.java
index 6dc3f974f8..f8c96dc52f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TArraysRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TArraysRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_ARRAYS", schema = "TEST")
 public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TArraysRecord> {
 
-	private static final long serialVersionUID = 2049861720;
+	private static final long serialVersionUID = -1311793694;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TArrays.T_ARRAYS.ID);
 	}
@@ -38,6 +42,7 @@ public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "STRING_ARRAY")
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord getStringArray() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TArrays.T_ARRAYS.STRING_ARRAY);
 	}
@@ -52,6 +57,7 @@ public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "NUMBER_ARRAY")
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord getNumberArray() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TArrays.T_ARRAYS.NUMBER_ARRAY);
 	}
@@ -66,6 +72,7 @@ public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "NUMBER_LONG_ARRAY")
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord getNumberLongArray() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TArrays.T_ARRAYS.NUMBER_LONG_ARRAY);
 	}
@@ -80,6 +87,7 @@ public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "DATE_ARRAY")
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UDateArrayRecord getDateArray() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TArrays.T_ARRAYS.DATE_ARRAY);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TAuthorRecord.java
index 7f1f937c74..5f49c42ae1 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TAuthorRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TAuthorRecord.java
@@ -8,9 +8,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
  *
  * An entity holding authors of books
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_AUTHOR", schema = "TEST")
 public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = 1395933321;
+	private static final long serialVersionUID = -307966792;
 
 	/**
 	 * The author ID
@@ -26,6 +28,8 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TAuthor.T_AUTHOR.ID);
 	}
@@ -64,6 +68,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * The author's first name
 	 */
+	@javax.persistence.Column(name = "FIRST_NAME")
 	public java.lang.String getFirstName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TAuthor.T_AUTHOR.FIRST_NAME);
 	}
@@ -78,6 +83,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * The author's last name
 	 */
+	@javax.persistence.Column(name = "LAST_NAME")
 	public java.lang.String getLastName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TAuthor.T_AUTHOR.LAST_NAME);
 	}
@@ -92,6 +98,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * The author's date of birth
 	 */
+	@javax.persistence.Column(name = "DATE_OF_BIRTH")
 	public java.sql.Date getDateOfBirth() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TAuthor.T_AUTHOR.DATE_OF_BIRTH);
 	}
@@ -106,6 +113,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * The author's year of birth
 	 */
+	@javax.persistence.Column(name = "YEAR_OF_BIRTH")
 	public java.lang.Integer getYearOfBirth() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TAuthor.T_AUTHOR.YEAR_OF_BIRTH);
 	}
@@ -120,6 +128,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * The author's address
 	 */
+	@javax.persistence.Column(name = "ADDRESS")
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord getAddress() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TAuthor.T_AUTHOR.ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookRecord.java
index a7c6cdae00..79adb4a10b 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookRecord.java
@@ -8,9 +8,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
  *
  * An entity holding books
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK", schema = "TEST")
 public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = -296790288;
+	private static final long serialVersionUID = -777564483;
 
 	/**
 	 * The book ID
@@ -26,6 +28,8 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.ID);
 	}
@@ -64,6 +68,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * REFERENCES TEST.T_AUTHOR (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "AUTHOR_ID")
 	public java.lang.Integer getAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.AUTHOR_ID);
 	}
@@ -106,6 +111,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * REFERENCES TEST.T_AUTHOR (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
 	public java.lang.Integer getCoAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.CO_AUTHOR_ID);
 	}
@@ -136,6 +142,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "DETAILS_ID")
 	public java.lang.Integer getDetailsId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.DETAILS_ID);
 	}
@@ -150,6 +157,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * The book's title
 	 */
+	@javax.persistence.Column(name = "TITLE")
 	public java.lang.String getTitle() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.TITLE);
 	}
@@ -164,6 +172,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * The year the book was published in
 	 */
+	@javax.persistence.Column(name = "PUBLISHED_IN")
 	public java.lang.Integer getPublishedIn() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.PUBLISHED_IN);
 	}
@@ -190,6 +199,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * REFERENCES TEST.T_LANGUAGE (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "LANGUAGE_ID")
 	public org.jooq.test.oracle.generatedclasses.test.enums.TLanguage getLanguageId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.LANGUAGE_ID);
 	}
@@ -204,6 +214,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * Some textual content of the book
 	 */
+	@javax.persistence.Column(name = "CONTENT_TEXT")
 	public java.lang.String getContentText() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.CONTENT_TEXT);
 	}
@@ -218,6 +229,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	/**
 	 * Some binary content of the book
 	 */
+	@javax.persistence.Column(name = "CONTENT_PDF")
 	public byte[] getContentPdf() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBook.T_BOOK.CONTENT_PDF);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookStoreRecord.java
index 9e7219e7b7..91505c1419 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookStoreRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookStoreRecord.java
@@ -8,9 +8,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
  *
  * A book store
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK_STORE", schema = "TEST")
 public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = 112711967;
+	private static final long serialVersionUID = 1164792621;
 
 	/**
 	 * The books store name
@@ -22,6 +24,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq
 	/**
 	 * The books store name
 	 */
+	@javax.persistence.Column(name = "NAME", unique = true)
 	public java.lang.String getName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBookStore.T_BOOK_STORE.NAME);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookToBookStoreRecord.java
index 72313aa723..b58a347e8a 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookToBookStoreRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBookToBookStoreRecord.java
@@ -8,9 +8,13 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
  *
  * An m:n relation between books and book stores
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOK_TO_BOOK_STORE", schema = "TEST", uniqueConstraints = {
+	@javax.persistence.UniqueConstraint(columnNames = {"BOOK_STORE_NAME", "BOOK_ID"})
+})
 public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = 156801511;
+	private static final long serialVersionUID = -1226043006;
 
 	/**
 	 * The book store name
@@ -38,6 +42,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * REFERENCES TEST.T_BOOK_STORE (NAME)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "BOOK_STORE_NAME")
 	public java.lang.String getBookStoreName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_STORE_NAME);
 	}
@@ -105,6 +110,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * REFERENCES TEST.T_BOOK (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "BOOK_ID")
 	public java.lang.Integer getBookId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.BOOK_ID);
 	}
@@ -137,6 +143,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	/**
 	 * The number of books on stock
 	 */
+	@javax.persistence.Column(name = "STOCK")
 	public java.lang.Integer getStock() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE.STOCK);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBooleansRecord.java
index de5a660600..d99ccbdf9e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBooleansRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TBooleansRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_BOOLEANS", schema = "TEST")
 public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = -1973286582;
+	private static final long serialVersionUID = 1302763064;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.ID);
 	}
@@ -38,6 +42,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "ONE_ZERO")
 	public org.jooq.test.oracle.generatedclasses.test.enums.Boolean_10 getOneZero() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.ONE_ZERO);
 	}
@@ -52,6 +57,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TRUE_FALSE_LC")
 	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseLc getTrueFalseLc() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.TRUE_FALSE_LC);
 	}
@@ -66,6 +72,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TRUE_FALSE_UC")
 	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanTrueFalseUc getTrueFalseUc() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.TRUE_FALSE_UC);
 	}
@@ -80,6 +87,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "YES_NO_LC")
 	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoLc getYesNoLc() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.YES_NO_LC);
 	}
@@ -94,6 +102,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "YES_NO_UC")
 	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYesNoUc getYesNoUc() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.YES_NO_UC);
 	}
@@ -108,6 +117,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "Y_N_LC")
 	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnLc getYNLc() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.Y_N_LC);
 	}
@@ -122,6 +132,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "Y_N_UC")
 	public org.jooq.test.oracle.generatedclasses.test.enums.BooleanYnUc getYNUc() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.Y_N_UC);
 	}
@@ -136,6 +147,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "VC_BOOLEAN")
 	public java.lang.Boolean getVcBoolean() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.VC_BOOLEAN);
 	}
@@ -150,6 +162,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "C_BOOLEAN")
 	public java.lang.Boolean getCBoolean() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.C_BOOLEAN);
 	}
@@ -164,6 +177,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "N_BOOLEAN")
 	public java.lang.Boolean getNBoolean() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TBooleans.T_BOOLEANS.N_BOOLEAN);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDatesRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDatesRecord.java
index bff3d13b9b..1bf6939988 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDatesRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDatesRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_DATES", schema = "TEST")
 public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = 2123150840;
+	private static final long serialVersionUID = 1364572252;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDates.T_DATES.ID);
 	}
@@ -38,6 +42,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "D")
 	public java.sql.Date getD() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDates.T_DATES.D);
 	}
@@ -52,6 +57,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "T")
 	public java.sql.Timestamp getT() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDates.T_DATES.T);
 	}
@@ -66,6 +72,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TS")
 	public java.sql.Timestamp getTs() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDates.T_DATES.TS);
 	}
@@ -80,6 +87,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "D_INT")
 	public java.lang.Integer getDInt() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDates.T_DATES.D_INT);
 	}
@@ -94,6 +102,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TS_BIGINT")
 	public java.lang.Long getTsBigint() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDates.T_DATES.TS_BIGINT);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDirectoryRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDirectoryRecord.java
index 49fdf605a8..00d5d1c069 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDirectoryRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TDirectoryRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_DIRECTORY", schema = "TEST")
 public class TDirectoryRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TDirectoryRecord> {
 
-	private static final long serialVersionUID = 440028521;
+	private static final long serialVersionUID = -1533470252;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TDirectoryRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDirectory.T_DIRECTORY.ID);
 	}
@@ -62,6 +66,7 @@ public class TDirectoryRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq
 	 * REFERENCES TEST.T_DIRECTORY (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "PARENT_ID")
 	public java.lang.Integer getParentId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDirectory.T_DIRECTORY.PARENT_ID);
 	}
@@ -92,6 +97,7 @@ public class TDirectoryRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "IS_DIRECTORY")
 	public java.lang.Byte getIsDirectory() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDirectory.T_DIRECTORY.IS_DIRECTORY);
 	}
@@ -106,6 +112,7 @@ public class TDirectoryRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "name")
 	public java.lang.String getName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TDirectory.T_DIRECTORY.NAME);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TTriggersRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TTriggersRecord.java
index c42a32cdb4..bcb8a5e326 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TTriggersRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/TTriggersRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_TRIGGERS", schema = "TEST")
 public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 1567554952;
+	private static final long serialVersionUID = 579771304;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID_GENERATED", unique = true)
 	public java.lang.Integer getIdGenerated() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TTriggers.T_TRIGGERS.ID_GENERATED);
 	}
@@ -38,6 +42,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "ID")
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TTriggers.T_TRIGGERS.ID);
 	}
@@ -52,6 +57,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "COUNTER")
 	public java.lang.Integer getCounter() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.TTriggers.T_TRIGGERS.COUNTER);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_639NumbersTableRecord.java
index d4090851ba..0fdf347666 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_639NumbersTableRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_639NumbersTableRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_639_NUMBERS_TABLE", schema = "TEST")
 public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -1188359471;
+	private static final long serialVersionUID = -230502624;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.ID);
 	}
@@ -38,6 +42,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "BYTE")
 	public java.lang.Byte getByte() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BYTE);
 	}
@@ -52,6 +57,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "SHORT")
 	public java.lang.Short getShort() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.SHORT);
 	}
@@ -66,6 +72,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "INTEGER")
 	public java.lang.Integer getInteger() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.INTEGER);
 	}
@@ -80,6 +87,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "LONG")
 	public java.lang.Long getLong() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.LONG);
 	}
@@ -94,6 +102,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "BYTE_DECIMAL")
 	public java.lang.Byte getByteDecimal() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BYTE_DECIMAL);
 	}
@@ -108,6 +117,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "SHORT_DECIMAL")
 	public java.lang.Short getShortDecimal() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.SHORT_DECIMAL);
 	}
@@ -122,6 +132,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "INTEGER_DECIMAL")
 	public java.lang.Integer getIntegerDecimal() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.INTEGER_DECIMAL);
 	}
@@ -136,6 +147,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "LONG_DECIMAL")
 	public java.lang.Long getLongDecimal() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.LONG_DECIMAL);
 	}
@@ -150,6 +162,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "BIG_INTEGER")
 	public java.math.BigInteger getBigInteger() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BIG_INTEGER);
 	}
@@ -164,6 +177,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "BIG_DECIMAL")
 	public java.math.BigDecimal getBigDecimal() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.BIG_DECIMAL);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_658RefRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_658RefRecord.java
index 823d264691..be88f4a9d1 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_658RefRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_658RefRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_658_REF", schema = "TEST")
 public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.T_658RefRecord> {
 
-	private static final long serialVersionUID = 1990827182;
+	private static final long serialVersionUID = 884202937;
 
 	/**
 	 * An uncommented item
@@ -32,6 +34,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * REFERENCES TEST.T_658_11 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "REF_11")
 	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_11 getRef_11() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_658Ref.T_658_REF.REF_11);
 	}
@@ -58,6 +61,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * REFERENCES TEST.T_658_21 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "REF_21")
 	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_21 getRef_21() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_658Ref.T_658_REF.REF_21);
 	}
@@ -84,6 +88,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * REFERENCES TEST.T_658_31 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "REF_31")
 	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_31 getRef_31() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_658Ref.T_658_REF.REF_31);
 	}
@@ -110,6 +115,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * REFERENCES TEST.T_658_12 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "REF_12")
 	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_12 getRef_12() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_658Ref.T_658_REF.REF_12);
 	}
@@ -136,6 +142,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * REFERENCES TEST.T_658_22 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "REF_22")
 	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_22 getRef_22() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_658Ref.T_658_REF.REF_22);
 	}
@@ -162,6 +169,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * REFERENCES TEST.T_658_32 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "REF_32")
 	public org.jooq.test.oracle.generatedclasses.test.enums.T_658_32 getRef_32() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_658Ref.T_658_REF.REF_32);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_725LobTestRecord.java
index e997ff66b6..14b2e18974 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_725LobTestRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_725LobTestRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_725_LOB_TEST", schema = "TEST")
 public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = 2025558529;
+	private static final long serialVersionUID = 1430845072;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_725LobTest.T_725_LOB_TEST.ID);
 	}
@@ -38,6 +42,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "LOB")
 	public byte[] getLob() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_725LobTest.T_725_LOB_TEST.LOB);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_785Record.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_785Record.java
index 04530a8ed0..bca7960442 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_785Record.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/T_785Record.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "T_785", schema = "TEST")
 public class T_785Record extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.T_785Record> {
 
-	private static final long serialVersionUID = 53882845;
+	private static final long serialVersionUID = 1652388604;
 
 	/**
 	 * An uncommented item
@@ -20,6 +22,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "ID")
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_785.T_785.ID);
 	}
@@ -34,6 +37,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "NAME")
 	public java.lang.String getName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_785.T_785.NAME);
 	}
@@ -48,6 +52,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "VALUE")
 	public java.lang.String getValue() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.T_785.T_785.VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VAuthorRecord.java
index af0736bbbb..53c4f32fd1 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VAuthorRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VAuthorRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_AUTHOR", schema = "TEST")
 public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = -263841920;
+	private static final long serialVersionUID = 510968114;
 
 	/**
 	 * An uncommented item
@@ -20,6 +22,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "ID")
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.ID);
 	}
@@ -34,6 +37,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "FIRST_NAME")
 	public java.lang.String getFirstName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.FIRST_NAME);
 	}
@@ -48,6 +52,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "LAST_NAME")
 	public java.lang.String getLastName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.LAST_NAME);
 	}
@@ -62,6 +67,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "DATE_OF_BIRTH")
 	public java.sql.Date getDateOfBirth() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.DATE_OF_BIRTH);
 	}
@@ -76,6 +82,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "YEAR_OF_BIRTH")
 	public java.lang.Integer getYearOfBirth() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.YEAR_OF_BIRTH);
 	}
@@ -90,6 +97,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.o
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "ADDRESS")
 	public org.jooq.test.oracle.generatedclasses.test.udt.records.UAddressTypeRecord getAddress() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VAuthor.V_AUTHOR.ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VBookRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VBookRecord.java
index 71215fb59a..f66ce4381c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VBookRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VBookRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_BOOK", schema = "TEST")
 public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.VBookRecord> {
 
-	private static final long serialVersionUID = 2068835626;
+	private static final long serialVersionUID = -1563723032;
 
 	/**
 	 * An uncommented item
@@ -20,6 +22,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "ID")
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.ID);
 	}
@@ -34,6 +37,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "AUTHOR_ID")
 	public java.lang.Integer getAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.AUTHOR_ID);
 	}
@@ -48,6 +52,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
 	public java.lang.Integer getCoAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.CO_AUTHOR_ID);
 	}
@@ -62,6 +67,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "DETAILS_ID")
 	public java.lang.Integer getDetailsId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.DETAILS_ID);
 	}
@@ -76,6 +82,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TITLE")
 	public java.lang.String getTitle() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.TITLE);
 	}
@@ -90,6 +97,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "PUBLISHED_IN")
 	public java.lang.Integer getPublishedIn() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.PUBLISHED_IN);
 	}
@@ -104,6 +112,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "LANGUAGE_ID")
 	public java.lang.Integer getLanguageId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.LANGUAGE_ID);
 	}
@@ -118,6 +127,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CONTENT_TEXT")
 	public java.lang.String getContentText() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.CONTENT_TEXT);
 	}
@@ -132,6 +142,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.ora
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CONTENT_PDF")
 	public byte[] getContentPdf() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VBook.V_BOOK.CONTENT_PDF);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VIncompleteRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VIncompleteRecord.java
index f1c6155707..25cf79d811 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VIncompleteRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VIncompleteRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_INCOMPLETE", schema = "TEST")
 public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.VIncompleteRecord> {
 
-	private static final long serialVersionUID = 1048612640;
+	private static final long serialVersionUID = -1291458455;
 
 	/**
 	 * An uncommented item
@@ -26,6 +28,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "ID")
 	public java.lang.Object getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.ID);
 	}
@@ -46,6 +49,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "AUTHOR_ID")
 	public java.lang.Object getAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.AUTHOR_ID);
 	}
@@ -66,6 +70,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "CO_AUTHOR_ID")
 	public java.lang.Object getCoAuthorId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.CO_AUTHOR_ID);
 	}
@@ -86,6 +91,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "DETAILS_ID")
 	public java.lang.Object getDetailsId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.DETAILS_ID);
 	}
@@ -106,6 +112,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "TITLE")
 	public java.lang.Object getTitle() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.TITLE);
 	}
@@ -126,6 +133,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "PUBLISHED_IN")
 	public java.lang.Object getPublishedIn() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.PUBLISHED_IN);
 	}
@@ -146,6 +154,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "LANGUAGE_ID")
 	public java.lang.Object getLanguageId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.LANGUAGE_ID);
 	}
@@ -166,6 +175,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "CONTENT_TEXT")
 	public java.lang.Object getContentText() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.CONTENT_TEXT);
 	}
@@ -186,6 +196,7 @@ public class VIncompleteRecord extends org.jooq.impl.TableRecordImpl<org.jooq.te
 	 * The SQL type of this item (UNDEFINED) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
+	@javax.persistence.Column(name = "CONTENT_PDF")
 	public java.lang.Object getContentPdf() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VIncomplete.V_INCOMPLETE.CONTENT_PDF);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VLibraryRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VLibraryRecord.java
index a01bee6474..081166b1c9 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VLibraryRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/VLibraryRecord.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "V_LIBRARY", schema = "TEST")
 public class VLibraryRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.VLibraryRecord> {
 
-	private static final long serialVersionUID = -376307566;
+	private static final long serialVersionUID = -438332383;
 
 	/**
 	 * An uncommented item
@@ -20,6 +22,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "AUTHOR")
 	public java.lang.String getAuthor() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VLibrary.V_LIBRARY.AUTHOR);
 	}
@@ -34,6 +37,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TITLE")
 	public java.lang.String getTitle() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.VLibrary.V_LIBRARY.TITLE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_64_69Record.java
index 3eb0591bba..1c0e91b9df 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_64_69Record.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_64_69Record.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_TEST_CASE_64_69", schema = "TEST")
 public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = 1036615729;
+	private static final long serialVersionUID = -2118051824;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_64_69.X_TEST_CASE_64_69.ID);
 	}
@@ -62,6 +66,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org
 	 * REFERENCES TEST.X_UNUSED (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "UNUSED_ID")
 	public java.lang.Integer getUnusedId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_64_69.X_TEST_CASE_64_69.UNUSED_ID);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_71Record.java
index 3498df9f47..c22475430c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_71Record.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_71Record.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_TEST_CASE_71", schema = "TEST")
 public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = -450082526;
+	private static final long serialVersionUID = 1780956447;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_71.X_TEST_CASE_71.ID);
 	}
@@ -50,6 +54,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * REFERENCES TEST.X_TEST_CASE_64_69 (ID)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "TEST_CASE_64_69_ID")
 	public java.lang.Short getTestCase_64_69Id() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_71.X_TEST_CASE_71.TEST_CASE_64_69_ID);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_85Record.java
index bd9f662589..e18496fb0c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_85Record.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XTestCase_85Record.java
@@ -6,9 +6,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
 /**
  * This class is generated by jOOQ.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_TEST_CASE_85", schema = "TEST")
 public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = -642886110;
+	private static final long serialVersionUID = -1212575239;
 
 	/**
 	 * An uncommented item
@@ -24,6 +26,8 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Id
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_85.X_TEST_CASE_85.ID);
 	}
@@ -50,6 +54,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * REFERENCES TEST.X_UNUSED (ID, NAME)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "X_UNUSED_ID")
 	public java.lang.Integer getXUnusedId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_85.X_TEST_CASE_85.X_UNUSED_ID);
 	}
@@ -93,6 +98,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * REFERENCES TEST.X_UNUSED (ID, NAME)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "X_UNUSED_NAME")
 	public java.lang.String getXUnusedName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XTestCase_85.X_TEST_CASE_85.X_UNUSED_NAME);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XUnusedRecord.java
index b6152a336a..1a35118757 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/records/XUnusedRecord.java
@@ -8,9 +8,13 @@ package org.jooq.test.oracle.generatedclasses.test.tables.records;
  *
  * An unused table in the same schema.
  */
+@javax.persistence.Entity
+@javax.persistence.Table(name = "X_UNUSED", schema = "TEST", uniqueConstraints = {
+	@javax.persistence.UniqueConstraint(columnNames = {"ID", "NAME"})
+})
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.oracle.generatedclasses.test.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1329347464;
+	private static final long serialVersionUID = 1076140418;
 
 	/**
 	 * An uncommented item
@@ -26,6 +30,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Column(name = "ID", unique = true)
 	public java.lang.Integer getId() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.ID);
 	}
@@ -82,6 +87,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
+	@javax.persistence.Column(name = "NAME")
 	public java.lang.String getName() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.NAME);
 	}
@@ -96,6 +102,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "BIG_INTEGER")
 	public java.math.BigInteger getBigInteger() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.BIG_INTEGER);
 	}
@@ -122,6 +129,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * REFERENCES TEST.X_UNUSED (ID, NAME)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "ID_REF")
 	public java.lang.Integer getIdRef() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.ID_REF);
 	}
@@ -153,6 +161,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CLASS")
 	public java.lang.Integer getClass_() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.CLASS);
 	}
@@ -167,6 +176,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "FIELDS")
 	public java.lang.Integer getFields_() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.FIELDS);
 	}
@@ -181,6 +191,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "CONFIGURATION")
 	public java.lang.Integer getConfiguration_() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.CONFIGURATION);
 	}
@@ -195,6 +206,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "U_D_T")
 	public java.lang.Integer getUDT() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.U_D_T);
 	}
@@ -209,6 +221,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "META_DATA")
 	public java.lang.Integer getMetaData_() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.META_DATA);
 	}
@@ -223,6 +236,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "TYPE0")
 	public java.lang.Integer getType0_() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.TYPE0);
 	}
@@ -237,6 +251,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "PRIMARY_KEY")
 	public java.lang.Integer getPrimaryKey() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.PRIMARY_KEY);
 	}
@@ -251,6 +266,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "PRIMARYKEY")
 	public java.lang.Integer getPrimarykey() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.PRIMARYKEY);
 	}
@@ -277,6 +293,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * REFERENCES TEST.X_UNUSED (ID, NAME)
 	 * </pre></code>
 	 */
+	@javax.persistence.Column(name = "NAME_REF")
 	public java.lang.String getNameRef() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.NAME_REF);
 	}
@@ -291,6 +308,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "FIELD 737")
 	public java.math.BigDecimal getField_737() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.FIELD_737);
 	}
@@ -305,6 +323,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "MS_UNUSED_ID_REF")
 	public java.lang.Integer getMsUnusedIdRef() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.MS_UNUSED_ID_REF);
 	}
@@ -319,6 +338,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	/**
 	 * An uncommented item
 	 */
+	@javax.persistence.Column(name = "MS_UNUSED_NAME_REF")
 	public java.lang.String getMsUnusedNameRef() {
 		return getValue(org.jooq.test.oracle.generatedclasses.test.tables.XUnused.X_UNUSED.MS_UNUSED_NAME_REF);
 	}