diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml
index 323fae7368..82902157af 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml
@@ -10196,9 +10196,9 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create.newRecord(AUTHOR.ID, AUTHOR.LAST_NAME));
             result.get(0).setValue(AUTHOR.ID, 1);
             result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
             mock[0] = new MockResult(1, result);
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml
index 5a510d058c..5dc902b342 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml
@@ -10760,9 +10760,9 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create.newRecord(AUTHOR.ID, AUTHOR.LAST_NAME));
             result.get(0).setValue(AUTHOR.ID, 1);
             result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
             mock[0] = new MockResult(1, result);
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
index 4a2b1571f9..d5f9d0edfa 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
@@ -18235,11 +18235,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
index ab33c1ab7c..6bd48cf2e8 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
@@ -11570,9 +11570,9 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create.newRecord(AUTHOR.ID, AUTHOR.LAST_NAME));
             result.get(0).setValue(AUTHOR.ID, 1);
             result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
             mock[0] = new MockResult(1, result);
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
index 491f41dd5f..d6ba1c5cfb 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
@@ -12401,11 +12401,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
index a6d8025a51..4b1f283105 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
@@ -13783,11 +13783,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
index 6a03340be6..befa661b8c 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
@@ -14490,11 +14490,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
index 141558fe96..582295654b 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
@@ -15460,11 +15460,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
index 6c1de84fce..7d229d72cc 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
@@ -15903,11 +15903,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
index 7a1ee08fcb..d34a47f3a9 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
@@ -16176,11 +16176,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
index 94c4aa3a21..d32639d8b5 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
@@ -17825,11 +17825,11 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
         // You decide, whether any given statement returns results, and how many
         else if (sql.toUpperCase().startsWith("SELECT")) {
 
-            // Always return one author record
-            Result<AuthorRecord> result = create.newResult(AUTHOR);
-            result.add(create.newRecord(AUTHOR));
-            result.get(0).setValue(AUTHOR.ID, 1);
-            result.get(0).setValue(AUTHOR.LAST_NAME, "Orwell");
+            // Always return one record
+            Result<Record2<Integer, String>> result = create.newResult(AUTHOR.ID, AUTHOR.LAST_NAME);
+            result.add(create
+                .newRecord(AUTHOR.ID, AUTHOR.LAST_NAME)
+                .values(1, "Orwell"));
             mock[0] = new MockResult(1, result);
         }