diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index 74b8d217ad..516d5ce196 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -1429,11 +1429,6 @@ public class JavaGenerator extends AbstractGenerator {
             out.tab(1).println("public %s(%s alias) {", className, String.class);
             out.tab(2).println("super(alias, %s, %s);", schemaId, fullTableId);
             out.tab(1).println("}");
-
-            out.tab(1).javadoc("Create an aliased <code>%s</code> table reference", table.getQualifiedOutputName());
-            out.tab(1).println("public %s(%s alias, %s... fieldAliases) {", className, String.class, String.class);
-            out.tab(2).println("super(alias, fieldAliases, %s, %s);", schemaId, fullTableId);
-            out.tab(1).println("}");
         }
 
         // Add primary / unique / foreign key information
@@ -1533,11 +1528,6 @@ public class JavaGenerator extends AbstractGenerator {
             out.tab(1).println("public %s as(%s alias) {", fullClassName, String.class);
             out.tab(2).println("return new %s(alias);", fullClassName);
             out.tab(1).println("}");
-
-            out.tab(1).overrideInherit();
-            out.tab(1).println("public %s as(%s alias, %s... fieldAliases) {", fullClassName, String.class, String.class);
-            out.tab(2).println("return new %s(alias, fieldAliases);", fullClassName);
-            out.tab(1).println("}");
         }
 
         out.println("}");
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TAuthor.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TAuthor.java
index 9be76b47f0..79fa6bb9cb 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TAuthor.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = -803481255;
+	private static final long serialVersionUID = -876538536;
 
 	/**
 	 * The singleton instance of <code>T_AUTHOR</code>
@@ -68,13 +68,6 @@ public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fire
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TAuthor.T_AUTHOR);
 	}
 
-	/**
-	 * Create an aliased <code>T_AUTHOR</code> table reference
-	 */
-	public TAuthor(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TAuthor.T_AUTHOR);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -98,12 +91,4 @@ public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fire
 	public org.jooq.test.firebird.generatedclasses.tables.TAuthor as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TAuthor(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TAuthor as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TAuthor(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBook.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBook.java
index 8853aba667..df63b9b831 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBook.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = 1619620142;
+	private static final long serialVersionUID = -128548119;
 
 	/**
 	 * The singleton instance of <code>T_BOOK</code>
@@ -88,13 +88,6 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebi
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBook.T_BOOK);
 	}
 
-	/**
-	 * Create an aliased <code>T_BOOK</code> table reference
-	 */
-	public TBook(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBook.T_BOOK);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -134,12 +127,4 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebi
 	public org.jooq.test.firebird.generatedclasses.tables.TBook as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TBook(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TBook as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TBook(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookStore.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookStore.java
index e77b80feec..423502e8b3 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookStore.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = -1094801776;
+	private static final long serialVersionUID = -654747619;
 
 	/**
 	 * The singleton instance of <code>T_BOOK_STORE</code>
@@ -43,13 +43,6 @@ public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.f
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBookStore.T_BOOK_STORE);
 	}
 
-	/**
-	 * Create an aliased <code>T_BOOK_STORE</code> table reference
-	 */
-	public TBookStore(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBookStore.T_BOOK_STORE);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -73,12 +66,4 @@ public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.f
 	public org.jooq.test.firebird.generatedclasses.tables.TBookStore as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TBookStore(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TBookStore as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TBookStore(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookToBookStore.java
index 6f07f4d57f..060c633f1d 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookToBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBookToBookStore.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = -1670057841;
+	private static final long serialVersionUID = 1703448656;
 
 	/**
 	 * The singleton instance of <code>T_BOOK_TO_BOOK_STORE</code>
@@ -53,13 +53,6 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE);
 	}
 
-	/**
-	 * Create an aliased <code>T_BOOK_TO_BOOK_STORE</code> table reference
-	 */
-	public TBookToBookStore(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -91,12 +84,4 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.
 	public org.jooq.test.firebird.generatedclasses.tables.TBookToBookStore as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TBookToBookStore(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TBookToBookStore as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TBookToBookStore(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBooleans.java
index e3fa7b5acb..a9ad4b4b51 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBooleans.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TBooleans.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = 12012988;
+	private static final long serialVersionUID = -788266501;
 
 	/**
 	 * The singleton instance of <code>T_BOOLEANS</code>
@@ -93,13 +93,6 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fi
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBooleans.T_BOOLEANS);
 	}
 
-	/**
-	 * Create an aliased <code>T_BOOLEANS</code> table reference
-	 */
-	public TBooleans(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TBooleans.T_BOOLEANS);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -123,12 +116,4 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fi
 	public org.jooq.test.firebird.generatedclasses.tables.TBooleans as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TBooleans(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TBooleans as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TBooleans(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TDates.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TDates.java
index 4ab41d1373..0bfca54420 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TDates.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TDates.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = 1407670265;
+	private static final long serialVersionUID = 483674874;
 
 	/**
 	 * The singleton instance of <code>T_DATES</code>
@@ -68,13 +68,6 @@ public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fireb
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TDates.T_DATES);
 	}
 
-	/**
-	 * Create an aliased <code>T_DATES</code> table reference
-	 */
-	public TDates(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TDates.T_DATES);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -98,12 +91,4 @@ public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fireb
 	public org.jooq.test.firebird.generatedclasses.tables.TDates as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TDates(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TDates as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TDates(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TLanguage.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TLanguage.java
index e5d5595273..9e204070c7 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TLanguage.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TLanguage.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TLanguage extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TLanguageRecord> {
 
-	private static final long serialVersionUID = 1587829272;
+	private static final long serialVersionUID = -959732629;
 
 	/**
 	 * The singleton instance of <code>T_LANGUAGE</code>
@@ -58,13 +58,6 @@ public class TLanguage extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fi
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TLanguage.T_LANGUAGE);
 	}
 
-	/**
-	 * Create an aliased <code>T_LANGUAGE</code> table reference
-	 */
-	public TLanguage(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TLanguage.T_LANGUAGE);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -88,12 +81,4 @@ public class TLanguage extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fi
 	public org.jooq.test.firebird.generatedclasses.tables.TLanguage as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TLanguage(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TLanguage as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TLanguage(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TTriggers.java
index 39b1834b38..281cf065a0 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/TTriggers.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 788630493;
+	private static final long serialVersionUID = -391714980;
 
 	/**
 	 * The singleton instance of <code>T_TRIGGERS</code>
@@ -53,13 +53,6 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fi
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TTriggers.T_TRIGGERS);
 	}
 
-	/**
-	 * Create an aliased <code>T_TRIGGERS</code> table reference
-	 */
-	public TTriggers(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.TTriggers.T_TRIGGERS);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -83,12 +76,4 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fi
 	public org.jooq.test.firebird.generatedclasses.tables.TTriggers as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.TTriggers(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.TTriggers as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.TTriggers(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java
index 25a196895a..f919fb4c23 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_639NumbersTable.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -162724696;
+	private static final long serialVersionUID = -774908419;
 
 	/**
 	 * The singleton instance of <code>T_639_NUMBERS_TABLE</code>
@@ -93,13 +93,6 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE);
 	}
 
-	/**
-	 * Create an aliased <code>T_639_NUMBERS_TABLE</code> table reference
-	 */
-	public T_639NumbersTable(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -123,12 +116,4 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 	public org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.T_639NumbersTable(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java
index 80c6db9262..f249074e39 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_725LobTest.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = 1187112419;
+	private static final long serialVersionUID = 1691099184;
 
 	/**
 	 * The singleton instance of <code>T_725_LOB_TEST</code>
@@ -48,13 +48,6 @@ public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST);
 	}
 
-	/**
-	 * Create an aliased <code>T_725_LOB_TEST</code> table reference
-	 */
-	public T_725LobTest(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -78,12 +71,4 @@ public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	public org.jooq.test.firebird.generatedclasses.tables.T_725LobTest as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.T_725LobTest(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.T_725LobTest as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.T_725LobTest(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_785.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_785.java
index c2e4f00075..3ebaf12c5e 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_785.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_785.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.firebird.generatedclasses.tables.records.T_785Record> {
 
-	private static final long serialVersionUID = -1280654829;
+	private static final long serialVersionUID = -1831112848;
 
 	/**
 	 * The singleton instance of <code>T_785</code>
@@ -53,13 +53,6 @@ public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.firebird.genera
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_785.T_785);
 	}
 
-	/**
-	 * Create an aliased <code>T_785</code> table reference
-	 */
-	public T_785(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_785.T_785);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -67,12 +60,4 @@ public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.firebird.genera
 	public org.jooq.test.firebird.generatedclasses.tables.T_785 as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.T_785(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.T_785 as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.T_785(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_937.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_937.java
index 724eab49cd..1475c2062a 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_937.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/T_937.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_937 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.T_937Record> {
 
-	private static final long serialVersionUID = 186972697;
+	private static final long serialVersionUID = 1613743360;
 
 	/**
 	 * The singleton instance of <code>T_937</code>
@@ -43,13 +43,6 @@ public class T_937 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebi
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_937.T_937);
 	}
 
-	/**
-	 * Create an aliased <code>T_937</code> table reference
-	 */
-	public T_937(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.T_937.T_937);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -73,12 +66,4 @@ public class T_937 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebi
 	public org.jooq.test.firebird.generatedclasses.tables.T_937 as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.T_937(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.T_937 as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.T_937(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VAuthor.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VAuthor.java
index 5c87307215..a1ef68830d 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VAuthor.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.firebird.generatedclasses.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = 1903880075;
+	private static final long serialVersionUID = -573394490;
 
 	/**
 	 * The singleton instance of <code>V_AUTHOR</code>
@@ -68,13 +68,6 @@ public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.firebird.gene
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.VAuthor.V_AUTHOR);
 	}
 
-	/**
-	 * Create an aliased <code>V_AUTHOR</code> table reference
-	 */
-	public VAuthor(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.VAuthor.V_AUTHOR);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,12 +75,4 @@ public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.firebird.gene
 	public org.jooq.test.firebird.generatedclasses.tables.VAuthor as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.VAuthor(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.VAuthor as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.VAuthor(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VBook.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VBook.java
index af5eb71588..649f36a9b1 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VBook.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VBook.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.firebird.generatedclasses.tables.records.VBookRecord> {
 
-	private static final long serialVersionUID = -1207879456;
+	private static final long serialVersionUID = -292419945;
 
 	/**
 	 * The singleton instance of <code>V_BOOK</code>
@@ -88,13 +88,6 @@ public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.firebird.genera
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.VBook.V_BOOK);
 	}
 
-	/**
-	 * Create an aliased <code>V_BOOK</code> table reference
-	 */
-	public VBook(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.VBook.V_BOOK);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -102,12 +95,4 @@ public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.firebird.genera
 	public org.jooq.test.firebird.generatedclasses.tables.VBook as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.VBook(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.VBook as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.VBook(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VLibrary.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VLibrary.java
index 80a12ae441..1e1d423e0d 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VLibrary.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/VLibrary.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.firebird.generatedclasses.tables.records.VLibraryRecord> {
 
-	private static final long serialVersionUID = -1711747034;
+	private static final long serialVersionUID = 367333083;
 
 	/**
 	 * The singleton instance of <code>V_LIBRARY</code>
@@ -48,13 +48,6 @@ public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.firebird.gen
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.VLibrary.V_LIBRARY);
 	}
 
-	/**
-	 * Create an aliased <code>V_LIBRARY</code> table reference
-	 */
-	public VLibrary(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.VLibrary.V_LIBRARY);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -62,12 +55,4 @@ public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.firebird.gen
 	public org.jooq.test.firebird.generatedclasses.tables.VLibrary as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.VLibrary(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.VLibrary as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.VLibrary(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_2025.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_2025.java
index cbb2351acc..a2a02b1bf8 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_2025.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_2025.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_2025 extends org.jooq.impl.TableImpl<org.jooq.test.firebird.generatedclasses.tables.records.XTestCase_2025Record> {
 
-	private static final long serialVersionUID = -470911317;
+	private static final long serialVersionUID = 1638246328;
 
 	/**
 	 * The singleton instance of <code>X_TEST_CASE_2025</code>
@@ -48,13 +48,6 @@ public class XTestCase_2025 extends org.jooq.impl.TableImpl<org.jooq.test.firebi
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025);
 	}
 
-	/**
-	 * Create an aliased <code>X_TEST_CASE_2025</code> table reference
-	 */
-	public XTestCase_2025(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -70,12 +63,4 @@ public class XTestCase_2025 extends org.jooq.impl.TableImpl<org.jooq.test.firebi
 	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_2025 as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_2025(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_2025 as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_2025(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_64_69.java
index 0a1c41ba03..9f2dd913c2 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_64_69.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_64_69.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = -2071013613;
+	private static final long serialVersionUID = 2026362102;
 
 	/**
 	 * The singleton instance of <code>X_TEST_CASE_64_69</code>
@@ -48,13 +48,6 @@ public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.t
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69);
 	}
 
-	/**
-	 * Create an aliased <code>X_TEST_CASE_64_69</code> table reference
-	 */
-	public XTestCase_64_69(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -86,12 +79,4 @@ public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.t
 	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_64_69 as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_64_69(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_64_69 as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_64_69(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_71.java
index 0998b7cff9..a8a23ea88c 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_71.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_71.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = -1167814787;
+	private static final long serialVersionUID = 1457687592;
 
 	/**
 	 * The singleton instance of <code>X_TEST_CASE_71</code>
@@ -48,13 +48,6 @@ public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71);
 	}
 
-	/**
-	 * Create an aliased <code>X_TEST_CASE_71</code> table reference
-	 */
-	public XTestCase_71(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -86,12 +79,4 @@ public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_71 as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_71(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_71 as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_71(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_85.java
index 703dfd99b1..fb8982e1db 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_85.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XTestCase_85.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = -1439313917;
+	private static final long serialVersionUID = -438391628;
 
 	/**
 	 * The singleton instance of <code>X_TEST_CASE_85</code>
@@ -53,13 +53,6 @@ public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85);
 	}
 
-	/**
-	 * Create an aliased <code>X_TEST_CASE_85</code> table reference
-	 */
-	public XTestCase_85(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -91,12 +84,4 @@ public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_85 as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_85(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.XTestCase_85 as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.XTestCase_85(alias, fieldAliases);
-	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XUnused.java
index 5bb435163d..55356b400c 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/firebird/generatedclasses/tables/XUnused.java
@@ -9,7 +9,7 @@ package org.jooq.test.firebird.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.firebird.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = 235163768;
+	private static final long serialVersionUID = -1012230075;
 
 	/**
 	 * The singleton instance of <code>X_UNUSED</code>
@@ -118,13 +118,6 @@ public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fire
 		super(alias, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XUnused.X_UNUSED);
 	}
 
-	/**
-	 * Create an aliased <code>X_UNUSED</code> table reference
-	 */
-	public XUnused(java.lang.String alias, java.lang.String... fieldAliases) {
-		super(alias, fieldAliases, (org.jooq.Schema) null, org.jooq.test.firebird.generatedclasses.tables.XUnused.X_UNUSED);
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -156,12 +149,4 @@ public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.fire
 	public org.jooq.test.firebird.generatedclasses.tables.XUnused as(java.lang.String alias) {
 		return new org.jooq.test.firebird.generatedclasses.tables.XUnused(alias);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.test.firebird.generatedclasses.tables.XUnused as(java.lang.String alias, java.lang.String... fieldAliases) {
-		return new org.jooq.test.firebird.generatedclasses.tables.XUnused(alias, fieldAliases);
-	}
 }