diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
index ebced9f7cd..f5d06cc0aa 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
@@ -16,31 +16,28 @@ public class Keys {
 	// IDENTITY definitions
 	// -------------------------------------------------------------------------
 
-	public static final org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> IDENTITY_T_TRIGGERS = Identities0.IDENTITY_T_TRIGGERS;
 
 	// -------------------------------------------------------------------------
 	// UNIQUE and PRIMARY KEY definitions
 	// -------------------------------------------------------------------------
 
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE_ID = UniqueKeys0.PK_T_639_NUMBERS_TABLE_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord> PK_T_725_LOB_TEST_ID = UniqueKeys0.PK_T_725_LOB_TEST_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record> PK_T_986_1_REF = UniqueKeys0.PK_T_986_1_REF;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record> PK_T_986_2_REF = UniqueKeys0.PK_T_986_2_REF;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> PK_T_AUTHOR_ID = UniqueKeys0.PK_T_AUTHOR_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> PK_T_BOOK_ID = UniqueKeys0.PK_T_BOOK_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> PK_T_BOOK_STORE_NAME = UniqueKeys0.PK_T_BOOK_STORE_NAME;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> PK_T_BOOK_TO_BOOK_STORE_BOOK_STORE_NAME = UniqueKeys0.PK_T_BOOK_TO_BOOK_STORE_BOOK_STORE_NAME;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> PK_T_BOOK_TO_BOOK_STORE_BOOK_ID = UniqueKeys0.PK_T_BOOK_TO_BOOK_STORE_BOOK_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord> PK_T_BOOLEANS_ID = UniqueKeys0.PK_T_BOOLEANS_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord> PK_T_DATES_ID = UniqueKeys0.PK_T_DATES_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord> PK_T_EXOTIC_TYPES_ID = UniqueKeys0.PK_T_EXOTIC_TYPES_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> PK_T_LANGUAGE_ID = UniqueKeys0.PK_T_LANGUAGE_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> PK_T_TRIGGERS_ID_GENERATED = UniqueKeys0.PK_T_TRIGGERS_ID_GENERATED;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> PK_X_TEST_CASE_64_69_ID = UniqueKeys0.PK_X_TEST_CASE_64_69_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> PK_X_TEST_CASE_71_ID = UniqueKeys0.PK_X_TEST_CASE_71_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> PK_X_TEST_CASE_85_ID = UniqueKeys0.PK_X_TEST_CASE_85_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> PK_X_UNUSED_ID = UniqueKeys0.PK_X_UNUSED_ID;
-	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> PK_X_UNUSED_NAME = UniqueKeys0.PK_X_UNUSED_NAME;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE = UniqueKeys0.PK_T_639_NUMBERS_TABLE;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord> PK_T_725_LOB_TEST = UniqueKeys0.PK_T_725_LOB_TEST;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record> PK_T_986_1 = UniqueKeys0.PK_T_986_1;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record> PK_T_986_2 = UniqueKeys0.PK_T_986_2;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> PK_T_AUTHOR = UniqueKeys0.PK_T_AUTHOR;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> PK_T_BOOK = UniqueKeys0.PK_T_BOOK;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> PK_T_BOOK_STORE = UniqueKeys0.PK_T_BOOK_STORE;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> PK_T_BOOK_TO_BOOK_STORE = UniqueKeys0.PK_T_BOOK_TO_BOOK_STORE;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord> PK_T_BOOLEANS = UniqueKeys0.PK_T_BOOLEANS;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord> PK_T_DATES = UniqueKeys0.PK_T_DATES;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord> PK_T_EXOTIC_TYPES = UniqueKeys0.PK_T_EXOTIC_TYPES;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> PK_T_LANGUAGE = UniqueKeys0.PK_T_LANGUAGE;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> PK_T_TRIGGERS = UniqueKeys0.PK_T_TRIGGERS;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> PK_X_TEST_CASE_64_69 = UniqueKeys0.PK_X_TEST_CASE_64_69;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> PK_X_TEST_CASE_71 = UniqueKeys0.PK_X_TEST_CASE_71;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> PK_X_TEST_CASE_85 = UniqueKeys0.PK_X_TEST_CASE_85;
+	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> PK_X_UNUSED = UniqueKeys0.PK_X_UNUSED;
 
 	// -------------------------------------------------------------------------
 	// FOREIGN KEY definitions
@@ -71,47 +68,41 @@ public class Keys {
 	// [#1459] distribute members to avoid static initialisers > 64kb
 	// -------------------------------------------------------------------------
 
-	private static class Identities0 extends org.jooq.impl.AbstractKeys {
-		public static org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> IDENTITY_T_TRIGGERS = createIdentity(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED);
-	}
-
 	private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord> PK_T_725_LOB_TEST_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.sqlite.generatedclasses.tables.T_725LobTest.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record> PK_T_986_1_REF = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_986_1.T_986_1, org.jooq.test.sqlite.generatedclasses.tables.T_986_1.REF);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record> PK_T_986_2_REF = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_986_2.T_986_2, org.jooq.test.sqlite.generatedclasses.tables.T_986_2.REF);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> PK_T_AUTHOR_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TAuthor.T_AUTHOR, org.jooq.test.sqlite.generatedclasses.tables.TAuthor.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> PK_T_BOOK_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> PK_T_BOOK_STORE_NAME = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookStore.NAME);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> PK_T_BOOK_TO_BOOK_STORE_BOOK_STORE_NAME = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> PK_T_BOOK_TO_BOOK_STORE_BOOK_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord> PK_T_BOOLEANS_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.sqlite.generatedclasses.tables.TBooleans.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord> PK_T_DATES_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TDates.T_DATES, org.jooq.test.sqlite.generatedclasses.tables.TDates.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord> PK_T_EXOTIC_TYPES_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TExoticTypes.T_EXOTIC_TYPES, org.jooq.test.sqlite.generatedclasses.tables.TExoticTypes.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> PK_T_LANGUAGE_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TLanguage.T_LANGUAGE, org.jooq.test.sqlite.generatedclasses.tables.TLanguage.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> PK_T_TRIGGERS_ID_GENERATED = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> PK_X_TEST_CASE_64_69_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> PK_X_TEST_CASE_71_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> PK_X_TEST_CASE_85_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> PK_X_UNUSED_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XUnused.ID);
-		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> PK_X_UNUSED_NAME = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XUnused.NAME);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord> PK_T_725_LOB_TEST = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.sqlite.generatedclasses.tables.T_725LobTest.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record> PK_T_986_1 = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_986_1.T_986_1, org.jooq.test.sqlite.generatedclasses.tables.T_986_1.REF);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record> PK_T_986_2 = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_986_2.T_986_2, org.jooq.test.sqlite.generatedclasses.tables.T_986_2.REF);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> PK_T_AUTHOR = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TAuthor.T_AUTHOR, org.jooq.test.sqlite.generatedclasses.tables.TAuthor.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> PK_T_BOOK = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> PK_T_BOOK_STORE = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBookStore.T_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookStore.NAME);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> PK_T_BOOK_TO_BOOK_STORE = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord> PK_T_BOOLEANS = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TBooleans.T_BOOLEANS, org.jooq.test.sqlite.generatedclasses.tables.TBooleans.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord> PK_T_DATES = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TDates.T_DATES, org.jooq.test.sqlite.generatedclasses.tables.TDates.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord> PK_T_EXOTIC_TYPES = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TExoticTypes.T_EXOTIC_TYPES, org.jooq.test.sqlite.generatedclasses.tables.TExoticTypes.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> PK_T_LANGUAGE = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TLanguage.T_LANGUAGE, org.jooq.test.sqlite.generatedclasses.tables.TLanguage.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> PK_T_TRIGGERS = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> PK_X_TEST_CASE_64_69 = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> PK_X_TEST_CASE_71 = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> PK_X_TEST_CASE_85 = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.ID);
+		public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> PK_X_UNUSED = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XUnused.ID, org.jooq.test.sqlite.generatedclasses.tables.XUnused.NAME);
 	}
 
 	private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys {
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_T_986_1_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.T_986_1.T_986_1, org.jooq.test.sqlite.generatedclasses.tables.T_986_1.REF);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_T_986_2_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.T_986_2.T_986_2, org.jooq.test.sqlite.generatedclasses.tables.T_986_2.REF);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> FK_T_BOOK_T_AUTHOR_2 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR_ID, org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.AUTHOR_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> FK_T_BOOK_T_AUTHOR_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR_ID, org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.CO_AUTHOR_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> FK_T_BOOK_T_LANGUAGE_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_LANGUAGE_ID, org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.LANGUAGE_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> FK_T_BOOK_TO_BOOK_STORE_T_BOOK_STORE_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_STORE_NAME, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> FK_T_BOOK_TO_BOOK_STORE_T_BOOK_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_ID, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_2025_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_NAME);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> FK_X_TEST_CASE_2025_X_TEST_CASE_71_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_71_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> FK_X_TEST_CASE_2025_X_TEST_CASE_85_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_85_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_64_69_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.UNUSED_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_64_69_X_UNUSED_2 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.UNUSED_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record, org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> FK_X_TEST_CASE_71_X_TEST_CASE_64_69_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_64_69_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.TEST_CASE_64_69_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_85_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_UNUSED_NAME);
-		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_UNUSED_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XUnused.ID_REF, org.jooq.test.sqlite.generatedclasses.tables.XUnused.NAME_REF);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_T_986_1_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.T_986_1.T_986_1, org.jooq.test.sqlite.generatedclasses.tables.T_986_1.REF);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_T_986_2_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.T_986_2.T_986_2, org.jooq.test.sqlite.generatedclasses.tables.T_986_2.REF);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> FK_T_BOOK_T_AUTHOR_2 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR, org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.AUTHOR_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> FK_T_BOOK_T_AUTHOR_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR, org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.CO_AUTHOR_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> FK_T_BOOK_T_LANGUAGE_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_LANGUAGE, org.jooq.test.sqlite.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBook.LANGUAGE_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> FK_T_BOOK_TO_BOOK_STORE_T_BOOK_STORE_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord, org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> FK_T_BOOK_TO_BOOK_STORE_T_BOOK_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.sqlite.generatedclasses.tables.TBookToBookStore.BOOK_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_2025_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_NAME);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> FK_X_TEST_CASE_2025_X_TEST_CASE_71_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_71, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> FK_X_TEST_CASE_2025_X_TEST_CASE_85_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_85, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_2025.REF_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_64_69_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.UNUSED_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_64_69_X_UNUSED_2 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_64_69.UNUSED_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record, org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> FK_X_TEST_CASE_71_X_TEST_CASE_64_69_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_64_69, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_71.TEST_CASE_64_69_ID);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_85_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.tables.XTestCase_85.X_UNUSED_NAME);
+		public static final org.jooq.ForeignKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord, org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> FK_X_UNUSED_X_UNUSED_1 = createForeignKey(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.sqlite.generatedclasses.tables.XUnused.ID_REF, org.jooq.test.sqlite.generatedclasses.tables.XUnused.NAME_REF);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TAuthor.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TAuthor.java
index be18c2523f..f01b369809 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TAuthor.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = -1728221493;
+	private static final long serialVersionUID = 456854435;
 
 	/**
 	 * The singleton instance of <code>t_author</code>
@@ -66,7 +66,7 @@ public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR;
 	}
 
 	/**
@@ -74,6 +74,6 @@ public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_AUTHOR);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBook.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBook.java
index 1440f8a728..7bb67c63dc 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBook.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = 1727862334;
+	private static final long serialVersionUID = 1211049386;
 
 	/**
 	 * The singleton instance of <code>t_book</code>
@@ -81,7 +81,7 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK;
 	}
 
 	/**
@@ -89,7 +89,7 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookStore.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookStore.java
index b96ec6bd97..01da40e8a7 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookStore.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = -1694538975;
+	private static final long serialVersionUID = -903660643;
 
 	/**
 	 * The singleton instance of <code>t_book_store</code>
@@ -41,7 +41,7 @@ public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.s
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_STORE_NAME;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_STORE;
 	}
 
 	/**
@@ -49,6 +49,6 @@ public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.s
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_STORE_NAME);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_STORE);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookToBookStore.java
index 20b8464687..d3252e4ca8 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookToBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBookToBookStore.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = 1692105237;
+	private static final long serialVersionUID = 2012131789;
 
 	/**
 	 * The singleton instance of <code>t_book_to_book_store</code>
@@ -51,7 +51,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_TO_BOOK_STORE_BOOK_STORE_NAME;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_TO_BOOK_STORE;
 	}
 
 	/**
@@ -59,7 +59,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_TO_BOOK_STORE_BOOK_STORE_NAME, org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_TO_BOOK_STORE_BOOK_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOK_TO_BOOK_STORE);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java
index 398682a798..cc73393131 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TBooleans.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = 595933987;
+	private static final long serialVersionUID = -1015725445;
 
 	/**
 	 * The singleton instance of <code>t_booleans</code>
@@ -91,7 +91,7 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOLEANS_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOLEANS;
 	}
 
 	/**
@@ -99,6 +99,6 @@ public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOLEANS_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TBooleansRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_BOOLEANS);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TDates.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TDates.java
index 7b50e4c3ff..7f1f32dc2e 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TDates.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TDates.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = 618851059;
+	private static final long serialVersionUID = 955611831;
 
 	/**
 	 * The singleton instance of <code>t_dates</code>
@@ -66,7 +66,7 @@ public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlit
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_DATES_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_DATES;
 	}
 
 	/**
@@ -74,6 +74,6 @@ public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlit
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_DATES_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_DATES);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TExoticTypes.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TExoticTypes.java
index 128d81468c..bb4d54dd31 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TExoticTypes.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TExoticTypes.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TExoticTypes extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord> {
 
-	private static final long serialVersionUID = 1788362863;
+	private static final long serialVersionUID = 1699895153;
 
 	/**
 	 * The singleton instance of <code>t_exotic_types</code>
@@ -46,7 +46,7 @@ public class TExoticTypes extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_EXOTIC_TYPES_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_EXOTIC_TYPES;
 	}
 
 	/**
@@ -54,6 +54,6 @@ public class TExoticTypes extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_EXOTIC_TYPES_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TExoticTypesRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_EXOTIC_TYPES);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TLanguage.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TLanguage.java
index 783ffca4ba..3fb61a875b 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TLanguage.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TLanguage.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TLanguage extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> {
 
-	private static final long serialVersionUID = -2092951917;
+	private static final long serialVersionUID = 991076773;
 
 	/**
 	 * The singleton instance of <code>t_language</code>
@@ -56,7 +56,7 @@ public class TLanguage extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_LANGUAGE_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_LANGUAGE;
 	}
 
 	/**
@@ -64,6 +64,6 @@ public class TLanguage extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_LANGUAGE_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TLanguageRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_LANGUAGE);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
index 1a614119c7..b3e0f7e21a 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = -262484221;
+	private static final long serialVersionUID = -1716027256;
 
 	/**
 	 * The singleton instance of <code>t_triggers</code>
@@ -46,20 +46,12 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 		super("t_triggers", org.jooq.test.sqlite.generatedclasses.DefaultSchema.DEFAULT_SCHEMA);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> getIdentity() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.IDENTITY_T_TRIGGERS;
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_TRIGGERS_ID_GENERATED;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_TRIGGERS;
 	}
 
 	/**
@@ -67,6 +59,6 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_TRIGGERS_ID_GENERATED);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_TRIGGERS);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java
index a8fa79fe58..4e5d982fdb 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -1945389367;
+	private static final long serialVersionUID = -1170408865;
 
 	/**
 	 * The singleton instance of <code>t_639_numbers_table</code>
@@ -101,7 +101,7 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_639_NUMBERS_TABLE_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_639_NUMBERS_TABLE;
 	}
 
 	/**
@@ -109,6 +109,6 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_639_NUMBERS_TABLE_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_639_NUMBERS_TABLE);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_725LobTest.java
index 3052d265d9..8495dccdc1 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_725LobTest.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_725LobTest.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = 526534069;
+	private static final long serialVersionUID = -1238495887;
 
 	/**
 	 * The singleton instance of <code>t_725_lob_test</code>
@@ -46,7 +46,7 @@ public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_725_LOB_TEST_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_725_LOB_TEST;
 	}
 
 	/**
@@ -54,6 +54,6 @@ public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_725_LOB_TEST_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_725LobTestRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_725_LOB_TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_1.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_1.java
index daa83d4fee..f430cec158 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_1.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_1.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_986_1 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record> {
 
-	private static final long serialVersionUID = 942723367;
+	private static final long serialVersionUID = 1436608191;
 
 	/**
 	 * The singleton instance of <code>t_986_1</code>
@@ -41,7 +41,7 @@ public class T_986_1 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_1_REF;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_1;
 	}
 
 	/**
@@ -49,7 +49,7 @@ public class T_986_1 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_1_REF);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_1Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_1);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_2.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_2.java
index 1b38655cd1..451a770cad 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_2.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/T_986_2.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class T_986_2 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record> {
 
-	private static final long serialVersionUID = 1450129256;
+	private static final long serialVersionUID = 573544064;
 
 	/**
 	 * The singleton instance of <code>t_986_2</code>
@@ -41,7 +41,7 @@ public class T_986_2 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_2_REF;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_2;
 	}
 
 	/**
@@ -49,7 +49,7 @@ public class T_986_2 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_2_REF);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_986_2Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_T_986_2);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_64_69.java
index c1424a3ef1..117568ad1d 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_64_69.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_64_69.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = 922452441;
+	private static final long serialVersionUID = 1078251343;
 
 	/**
 	 * The singleton instance of <code>x_test_case_64_69</code>
@@ -46,7 +46,7 @@ public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.t
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_64_69_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_64_69;
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.t
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_64_69_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_64_69Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_64_69);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_71.java
index eeb7e356fb..9abbf9defd 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_71.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_71.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = -1085782779;
+	private static final long serialVersionUID = 1682394863;
 
 	/**
 	 * The singleton instance of <code>x_test_case_71</code>
@@ -46,7 +46,7 @@ public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_71_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_71;
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_71_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_71Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_71);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_85.java
index 6b4c75d385..114f6719f0 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_85.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XTestCase_85.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = -1999897209;
+	private static final long serialVersionUID = 1436824003;
 
 	/**
 	 * The singleton instance of <code>x_test_case_85</code>
@@ -51,7 +51,7 @@ public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_85_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_85;
 	}
 
 	/**
@@ -59,7 +59,7 @@ public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_85_ID);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XTestCase_85Record>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_TEST_CASE_85);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java
index 814a00a879..f38ef629b2 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
 @java.lang.SuppressWarnings("all")
 public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -320664783;
+	private static final long serialVersionUID = 1321864932;
 
 	/**
 	 * The singleton instance of <code>x_unused</code>
@@ -106,7 +106,7 @@ public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> getMainKey() {
-		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID;
+		return org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED;
 	}
 
 	/**
@@ -114,7 +114,7 @@ public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqli
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_ID, org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED_NAME);
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord>>asList(org.jooq.test.sqlite.generatedclasses.Keys.PK_X_UNUSED);
 	}
 
 	/**
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBookToBookStoreRecord.java
index 554eb81a52..346f689b73 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBookToBookStoreRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/TBookToBookStoreRecord.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables.records;
 @java.lang.SuppressWarnings("all")
 public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord> implements org.jooq.Record3<java.lang.String, java.lang.Integer, java.lang.Integer> {
 
-	private static final long serialVersionUID = 134630571;
+	private static final long serialVersionUID = -732246195;
 
 	/**
 	 * Setter for <code>t_book_to_book_store.book_store_name</code>. 
@@ -61,8 +61,8 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Record1<java.lang.String> key() {
-		return (org.jooq.Record1) super.key();
+	public org.jooq.Record2<java.lang.String, java.lang.Integer> key() {
+		return (org.jooq.Record2) super.key();
 	}
 
 	// -------------------------------------------------------------------------
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java
index 281481fc2a..17c4a983c1 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/records/XUnusedRecord.java
@@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables.records;
 @java.lang.SuppressWarnings("all")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sqlite.generatedclasses.tables.records.XUnusedRecord> implements org.jooq.Record14<java.lang.Integer, java.lang.String, java.math.BigInteger, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 776710131;
+	private static final long serialVersionUID = 1319267918;
 
 	/**
 	 * Setter for <code>x_unused.ID</code>. 
@@ -215,8 +215,8 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Record1<java.lang.Integer> key() {
-		return (org.jooq.Record1) super.key();
+	public org.jooq.Record2<java.lang.Integer, java.lang.String> key() {
+		return (org.jooq.Record2) super.key();
 	}
 
 	// -------------------------------------------------------------------------