diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java
index a7b203beb4..dc316174d9 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/Keys.java
@@ -106,13 +106,13 @@ public class Keys {
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.TBookRecord, org.jooq.test.h2.generatedclasses.tables.records.TLanguageRecord> FK_T_BOOK_LANGUAGE_ID = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_T_LANGUAGE, org.jooq.test.h2.generatedclasses.tables.TBook.T_BOOK, org.jooq.test.h2.generatedclasses.tables.TBook.LANGUAGE_ID);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.TBookToBookStoreRecord, org.jooq.test.h2.generatedclasses.tables.records.TBookStoreRecord> FK_B2BS_BS_NAME = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.UK_T_BOOK_STORE_NAME, org.jooq.test.h2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.h2.generatedclasses.tables.TBookToBookStore.BOOK_STORE_NAME);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.TBookToBookStoreRecord, org.jooq.test.h2.generatedclasses.tables.records.TBookRecord> FK_B2BS_B_ID = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_T_BOOK, org.jooq.test.h2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE, org.jooq.test.h2.generatedclasses.tables.TBookToBookStore.BOOK_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_UNUSED_SELF = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XUnused.ID_REF, org.jooq.test.h2.generatedclasses.tables.XUnused.ID_REF, org.jooq.test.h2.generatedclasses.tables.XUnused.NAME_REF, org.jooq.test.h2.generatedclasses.tables.XUnused.NAME_REF);
+		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_UNUSED_SELF = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XUnused.X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XUnused.ID_REF, org.jooq.test.h2.generatedclasses.tables.XUnused.NAME_REF, org.jooq.test.h2.generatedclasses.tables.XUnused.NAME_REF);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_64_69Record, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_64_69A = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.UK_X_UNUSED_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.h2.generatedclasses.tables.XTestCase_64_69.UNUSED_ID);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_64_69Record, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_64_69B = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.UK_X_UNUSED_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69, org.jooq.test.h2.generatedclasses.tables.XTestCase_64_69.UNUSED_ID);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_71Record, org.jooq.test.h2.generatedclasses.tables.records.XTestCase_64_69Record> FK_X_TEST_CASE_71 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_TEST_CASE_64_69, org.jooq.test.h2.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71, org.jooq.test.h2.generatedclasses.tables.XTestCase_71.TEST_CASE_64_69_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_85Record, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_85 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_NAME, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_NAME);
+		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_85Record, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_85 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_NAME, org.jooq.test.h2.generatedclasses.tables.XTestCase_85.X_UNUSED_NAME);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.h2.generatedclasses.tables.records.XTestCase_85Record> FK_X_TEST_CASE_2025_1 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_TEST_CASE_85, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_ID);
 		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.h2.generatedclasses.tables.records.XTestCase_71Record> FK_X_TEST_CASE_2025_2 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_TEST_CASE_71, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_ID);
-		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_2025_3 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_NAME, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_NAME);
+		public static final org.jooq.ForeignKey<org.jooq.test.h2.generatedclasses.tables.records.XTestCase_2025Record, org.jooq.test.h2.generatedclasses.tables.records.XUnusedRecord> FK_X_TEST_CASE_2025_3 = createForeignKey(org.jooq.test.h2.generatedclasses.Keys.PK_X_UNUSED, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_ID, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_NAME, org.jooq.test.h2.generatedclasses.tables.XTestCase_2025.REF_NAME);
 	}
 }
diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_2698.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_2698.java
index 64a5a8f542..833e6d4f89 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_2698.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/T_2698.java
@@ -9,7 +9,7 @@ package org.jooq.test.h2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class T_2698 extends org.jooq.impl.TableImpl<org.jooq.test.h2.generatedclasses.tables.records.T_2698Record> {
 
-	private static final long serialVersionUID = 2072069763;
+	private static final long serialVersionUID = 1161406396;
 
 	/**
 	 * The singleton instance of <code>PUBLIC.T_2698</code>
@@ -34,6 +34,11 @@ public class T_2698 extends org.jooq.impl.TableImpl<org.jooq.test.h2.generatedcl
 	 */
 	public static final org.jooq.TableField<org.jooq.test.h2.generatedclasses.tables.records.T_2698Record, java.lang.Integer> XX = createField("XX", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), T_2698, "");
 
+	/**
+	 * The column <code>PUBLIC.T_2698.YY</code>.
+	 */
+	public static final org.jooq.TableField<org.jooq.test.h2.generatedclasses.tables.records.T_2698Record, java.lang.Integer> YY = createField("YY", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), T_2698, "");
+
 	/**
 	 * No further instances allowed
 	 */
diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_2698Dao.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_2698Dao.java
index 1a14d62fa8..a91b8334e0 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_2698Dao.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/daos/T_2698Dao.java
@@ -51,4 +51,11 @@ public class T_2698Dao extends org.jooq.impl.DAOImpl<org.jooq.test.h2.generatedc
 	public java.util.List<org.jooq.test.h2.generatedclasses.tables.pojos.T_2698> fetchByXx(java.lang.Integer... values) {
 		return fetch(org.jooq.test.h2.generatedclasses.tables.T_2698.XX, values);
 	}
+
+	/**
+	 * Fetch records that have <code>YY IN (values)</code>
+	 */
+	public java.util.List<org.jooq.test.h2.generatedclasses.tables.pojos.T_2698> fetchByYy(java.lang.Integer... values) {
+		return fetch(org.jooq.test.h2.generatedclasses.tables.T_2698.YY, values);
+	}
 }
diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_2698.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_2698.java
index 5a45e6bb9a..d065d009de 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_2698.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/interfaces/IT_2698.java
@@ -29,6 +29,16 @@ public interface IT_2698 extends java.io.Serializable {
 	 */
 	public java.lang.Integer getXx();
 
+	/**
+	 * Setter for <code>PUBLIC.T_2698.YY</code>.
+	 */
+	public IT_2698 setYy(java.lang.Integer value);
+
+	/**
+	 * Getter for <code>PUBLIC.T_2698.YY</code>.
+	 */
+	public java.lang.Integer getYy();
+
 	// -------------------------------------------------------------------------
 	// FROM and INTO
 	// -------------------------------------------------------------------------
diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_2698.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_2698.java
index 4e378532b0..a80d4b5d5a 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_2698.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/pojos/T_2698.java
@@ -9,19 +9,22 @@ package org.jooq.test.h2.generatedclasses.tables.pojos;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class T_2698 implements org.jooq.test.h2.generatedclasses.tables.interfaces.IT_2698 {
 
-	private static final long serialVersionUID = 305743184;
+	private static final long serialVersionUID = 1914413240;
 
 	private java.lang.Integer id;
 	private java.lang.Integer xx;
+	private java.lang.Integer yy;
 
 	public T_2698() {}
 
 	public T_2698(
 		java.lang.Integer id,
-		java.lang.Integer xx
+		java.lang.Integer xx,
+		java.lang.Integer yy
 	) {
 		this.id = id;
 		this.xx = xx;
+		this.yy = yy;
 	}
 
 	@Override
@@ -46,6 +49,17 @@ public class T_2698 implements org.jooq.test.h2.generatedclasses.tables.interfac
 		return this;
 	}
 
+	@Override
+	public java.lang.Integer getYy() {
+		return this.yy;
+	}
+
+	@Override
+	public T_2698 setYy(java.lang.Integer yy) {
+		this.yy = yy;
+		return this;
+	}
+
 	// -------------------------------------------------------------------------
 	// FROM and INTO
 	// -------------------------------------------------------------------------
@@ -57,6 +71,7 @@ public class T_2698 implements org.jooq.test.h2.generatedclasses.tables.interfac
 	public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.IT_2698 from) {
 		setId(from.getId());
 		setXx(from.getXx());
+		setYy(from.getYy());
 	}
 
 	/**
diff --git a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_2698Record.java b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_2698Record.java
index 86d6032a86..952c466891 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_2698Record.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/h2/generatedclasses/tables/records/T_2698Record.java
@@ -7,9 +7,9 @@ package org.jooq.test.h2.generatedclasses.tables.records;
  * This class is generated by jOOQ.
  */
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.h2.generatedclasses.tables.records.T_2698Record> implements org.jooq.Record2<java.lang.Integer, java.lang.Integer>, org.jooq.test.h2.generatedclasses.tables.interfaces.IT_2698 {
+public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.h2.generatedclasses.tables.records.T_2698Record> implements org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.Integer>, org.jooq.test.h2.generatedclasses.tables.interfaces.IT_2698 {
 
-	private static final long serialVersionUID = -678752966;
+	private static final long serialVersionUID = -440552484;
 
 	/**
 	 * Setter for <code>PUBLIC.T_2698.ID</code>.
@@ -45,6 +45,23 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 		return (java.lang.Integer) getValue(1);
 	}
 
+	/**
+	 * Setter for <code>PUBLIC.T_2698.YY</code>.
+	 */
+	@Override
+	public T_2698Record setYy(java.lang.Integer value) {
+		setValue(2, value);
+		return this;
+	}
+
+	/**
+	 * Getter for <code>PUBLIC.T_2698.YY</code>.
+	 */
+	@Override
+	public java.lang.Integer getYy() {
+		return (java.lang.Integer) getValue(2);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -58,23 +75,23 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	}
 
 	// -------------------------------------------------------------------------
-	// Record2 type implementation
+	// Record3 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row2<java.lang.Integer, java.lang.Integer> fieldsRow() {
-		return (org.jooq.Row2) super.fieldsRow();
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row2<java.lang.Integer, java.lang.Integer> valuesRow() {
-		return (org.jooq.Row2) super.valuesRow();
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
 	}
 
 	/**
@@ -93,6 +110,14 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 		return org.jooq.test.h2.generatedclasses.tables.T_2698.XX;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field3() {
+		return org.jooq.test.h2.generatedclasses.tables.T_2698.YY;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -109,6 +134,14 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 		return getXx();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value3() {
+		return getYy();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -131,7 +164,16 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	 * {@inheritDoc}
 	 */
 	@Override
-	public T_2698Record values(java.lang.Integer value1, java.lang.Integer value2) {
+	public T_2698Record value3(java.lang.Integer value) {
+		setYy(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T_2698Record values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3) {
 		return this;
 	}
 
@@ -146,6 +188,7 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	public void from(org.jooq.test.h2.generatedclasses.tables.interfaces.IT_2698 from) {
 		setId(from.getId());
 		setXx(from.getXx());
+		setYy(from.getYy());
 	}
 
 	/**
@@ -171,10 +214,11 @@ public class T_2698Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.tes
 	/**
 	 * Create a detached, initialised T_2698Record
 	 */
-	public T_2698Record(java.lang.Integer id, java.lang.Integer xx) {
+	public T_2698Record(java.lang.Integer id, java.lang.Integer xx, java.lang.Integer yy) {
 		super(org.jooq.test.h2.generatedclasses.tables.T_2698.T_2698);
 
 		setValue(0, id);
 		setValue(1, xx);
+		setValue(2, yy);
 	}
 }