[jOOQ/jOOQ#11729] Create a Java 17 distribution

- Updated Jenkinsfiles - Updated .classpath files (assuming Eclipse is Java 16 ready) - Add import org.jooq.Record where needed (org.jooq.* no longer works) - Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=572873 - Backport text blocks to pre Java 16 - Backport record types to pre Java 16 - Added a few record types to sources - Upgraded dependencies to build with Java 16+ - Backport pattern matching
2021-04-16 11:21:40 +02:00 · 2021-04-16 11:21:40 +02:00 · 0fad1b0190
commit 0fad1b0190
parent 4746bc2311
142 changed files with 216 additions and 183 deletions
--- a/jOOQ-codegen-maven/pom.xml
+++ b/jOOQ-codegen-maven/pom.xml
@ -28,6 +28,15 @@

    </licenses>

+    <!-- Workaround for https://issues.apache.org/jira/browse/MPLUGIN-369 -->
+    <repositories>
+        <repository>
+            <id>apache-snapshot-repository</id>
+            <name>Apache Snapshot Repository</name>
+            <url>https://repository.apache.org/snapshots/</url>
+        </repository>
+    </repositories>
+
    <build>
        <plugins>

@ -59,8 +68,17 @@
                        </goals>
                    </execution>
                </executions>
+                
+                <!-- Workaround for https://issues.apache.org/jira/browse/MPLUGIN-369 -->
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.plugin-tools</groupId>
+                        <artifactId>maven-plugin-tools-annotations</artifactId>
+                        <version>3.6.1-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
            </plugin>
-
+            
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
@ -100,7 +118,6 @@
        <dependency>
            <groupId>org.apache.maven.plugin-tools</groupId>
            <artifactId>maven-plugin-annotations</artifactId>
-            <scope>provided</scope>
        </dependency>
    </dependencies>
 </project>
--- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
@ -334,7 +334,7 @@ public abstract class AbstractDatabase implements Database {

        // [#6226] This is mostly due to a wrong Maven groupId
        catch (NoSuchFieldError e) {
-            log.error("NoSuchFieldError may happen when the jOOQ Open Source Edition (Maven groupId 'org.jooq') is used with a commercial SQLDialect. Use an appropriate groupId instead: 'org.jooq.trial', 'org.jooq.trial-java-6', 'org.jooq.trial-java-8', 'org.jooq.pro', 'org.jooq.pro-java-6', or 'org.jooq.pro-java-8'. See also: https://www.jooq.org/doc/latest/manual/getting-started/tutorials/jooq-in-7-steps/jooq-in-7-steps-step1/");
+            log.error("NoSuchFieldError may happen when the jOOQ Open Source Edition (Maven groupId 'org.jooq') is used with a commercial SQLDialect. Use an appropriate groupId instead: 'org.jooq.trial', 'org.jooq.trial-java-8', 'org.jooq.trial-java-11', 'org.jooq.pro', 'org.jooq.pro-java-8', or 'org.jooq.pro-java-11'. See also: https://www.jooq.org/doc/latest/manual/getting-started/tutorials/jooq-in-7-steps/jooq-in-7-steps-step1/");
            throw e;
        }

--- a/jOOQ/src/main/java/org/jooq/impl/Abs.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Acos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Asin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Atan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Call.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Call.java
@ -157,5 +157,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Chr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
@ -103,5 +103,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
@ -103,5 +103,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
@ -111,5 +111,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/Corr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Cos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Coth.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
@ -305,5 +305,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
@ -287,5 +287,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
@ -526,5 +526,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
@ -667,13 +667,7 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
        }
    }

-    private static final class ConstructorCall<E> implements Callable<E> {
-        private final Constructor<? extends E> constructor;
-
-        ConstructorCall(Constructor<? extends E> constructor) {
-            this.constructor = constructor;
-        }
-
+    private static final /* record */ class ConstructorCall<E> implements Callable<E> { private final Constructor<? extends E> constructor; ConstructorCall(Constructor<? extends E> constructor) { this.constructor = constructor; } public Constructor<? extends E> constructor() { return constructor; } @Override public boolean equals(Object o) { if (!(o instanceof ConstructorCall)) return false; ConstructorCall other = (ConstructorCall) o; if (!java.util.Objects.equals(this.constructor, other.constructor)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.constructor); } @Override public String toString() { return new StringBuilder("ConstructorCall[").append("constructor=").append(this.constructor).append("]").toString(); }
        @Override
        public E call() throws Exception {
            return constructor.newInstance();
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Deleting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
@ -99,5 +99,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/Diff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java
@ -718,19 +718,11 @@ final class Diff {
        return result.iterator();
    }

-    private static final class DiffResult {
-        final List<Query>           queries;
-        final Set<ForeignKey<?, ?>> droppedFks;
-
+    private static final /* record */ class DiffResult { private final List<Query> queries; private final Set<ForeignKey<?, ?>> droppedFks; DiffResult(List<Query> queries, Set<ForeignKey<?, ?>> droppedFks) { this.queries = queries; this.droppedFks = droppedFks; } public List<Query> queries() { return queries; } public Set<ForeignKey<?, ?>> droppedFks() { return droppedFks; } @Override public boolean equals(Object o) { if (!(o instanceof DiffResult)) return false; DiffResult other = (DiffResult) o; if (!java.util.Objects.equals(this.queries, other.queries)) return false; if (!java.util.Objects.equals(this.droppedFks, other.droppedFks)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.queries, this.droppedFks); }
        DiffResult() {
            this(new ArrayList<>(), new HashSet<>());
        }

-        DiffResult(List<Query> queries, Set<ForeignKey<?, ?>> droppedFks) {
-            this.queries = queries;
-            this.droppedFks = droppedFks;
-        }
-
        void addAll(DiffResult other) {
            queries.addAll(other.queries);
            droppedFks.addAll(other.droppedFks);
--- a/jOOQ/src/main/java/org/jooq/impl/Digits.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
@ -118,5 +118,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
@ -118,5 +118,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
@ -119,5 +119,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Exp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java
@ -147,36 +147,11 @@ final class ExplainQuery {
        return new ExplainImpl(rows, cost, result.format());
    }

-    private static final class ExplainImpl implements Explain {
-
-        private final double rows;
-        private final double cost;
-        private final String plan;
-
-        ExplainImpl(double rows, double cost, String plan) {
-            this.rows = rows;
-            this.cost = cost;
-            this.plan = plan;
-        }
-
-        @Override
-        public final double rows() {
-            return rows;
-        }
-
-        @Override
-        public final double cost() {
-            return cost;
-        }
-
-        @Override
-        public final String plan() {
-            return plan;
-        }
+    private static final /* record */ class ExplainImpl implements Explain { private final double rows; private final double cost; private final String plan; ExplainImpl(double rows, double cost, String plan) { this.rows = rows; this.cost = cost; this.plan = plan; } public double rows() { return rows; } public double cost() { return cost; } public String plan() { return plan; } @Override public boolean equals(Object o) { if (!(o instanceof ExplainImpl)) return false; ExplainImpl other = (ExplainImpl) o; if (!java.util.Objects.equals(this.rows, other.rows)) return false; if (!java.util.Objects.equals(this.cost, other.cost)) return false; if (!java.util.Objects.equals(this.plan, other.plan)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.rows, this.cost, this.plan); }

        @Override
        public String toString() {
-            return String.format("Explain [cost=%.2f, rows=%.2f]\n\n", cost, rows) + plan;
+            return String.format("Explain [cost=%.2f, rows=%.2f]nn", cost, rows) + plan;
        }
    }
 }
--- a/jOOQ/src/main/java/org/jooq/impl/Floor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Inserting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
@ -99,5 +99,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Left.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Left.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Level.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Level.java
@ -103,5 +103,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/Log.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Log10.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Lower.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/MD5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Median.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Median.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@ -4103,19 +4103,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
            return storageStep;
    }

-    private static final class ParseInlineConstraints {
-        final DataType<?> type;
-        final Comment     fieldComment;
-        final boolean     primary;
-        final boolean     identity;
-
-        ParseInlineConstraints(DataType<?> type, Comment fieldComment, boolean primary, boolean identity) {
-            this.type = type;
-            this.fieldComment = fieldComment;
-            this.primary = primary;
-            this.identity = identity;
-        }
-    }
+    private static final /* record */ class ParseInlineConstraints { private final DataType<?> type; private final Comment fieldComment; private final boolean primary; private final boolean identity; ParseInlineConstraints(DataType<?> type, Comment fieldComment, boolean primary, boolean identity) { this.type = type; this.fieldComment = fieldComment; this.primary = primary; this.identity = identity; } public DataType<?> type() { return type; } public Comment fieldComment() { return fieldComment; } public boolean primary() { return primary; } public boolean identity() { return identity; } @Override public boolean equals(Object o) { if (!(o instanceof ParseInlineConstraints)) return false; ParseInlineConstraints other = (ParseInlineConstraints) o; if (!java.util.Objects.equals(this.type, other.type)) return false; if (!java.util.Objects.equals(this.fieldComment, other.fieldComment)) return false; if (!java.util.Objects.equals(this.primary, other.primary)) return false; if (!java.util.Objects.equals(this.identity, other.identity)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.type, this.fieldComment, this.primary, this.identity); } @Override public String toString() { return new StringBuilder("ParseInlineConstraints[").append("type=").append(this.type).append(", fieldComment=").append(this.fieldComment).append(", primary=").append(this.primary).append(", identity=").append(this.identity).append("]").toString(); } }

    private final ParseInlineConstraints parseInlineConstraints(
        Name fieldName,
@ -13345,7 +13333,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {

            found = resolveInTableScope(tableScope.valueIterable(), lookup.getQualifiedName(), lookup, found);
            if (found != null)
-                lookup.delegate((AbstractField) found.value);
+                lookup.delegate((AbstractField) found.value());
            else
                retain.add(lookup);
        }
@ -13368,11 +13356,11 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
        for (Value<Table<?>> t : tables) {
            Value<Field<?>> f;

-            if (t.value instanceof JoinTable) {
+            if (t.value() instanceof JoinTable) {
                found = resolveInTableScope(
                    asList(
-                        new Value<>(t.scopeLevel, ((JoinTable) t.value).lhs),
-                        new Value<>(t.scopeLevel, ((JoinTable) t.value).rhs)
+                        new Value<>(t.scopeLevel(), ((JoinTable) t.value()).lhs),
+                        new Value<>(t.scopeLevel(), ((JoinTable) t.value()).rhs)
                    ),
                    lookupName, lookup, found
                );
@ -13385,12 +13373,12 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
                // - Test fully qualified column names vs partially qualified column names
                Name q = lookupName.qualifier();
                boolean x = q.qualified();
-                if (x && q.equals(t.value.getQualifiedName()) || !x && q.last().equals(t.value.getName()))
-                    if ((found = Value.of(t.scopeLevel, t.value.field(lookup.getName()))) != null)
+                if (x && q.equals(t.value().getQualifiedName()) || !x && q.last().equals(t.value().getName()))
+                    if ((found = Value.of(t.scopeLevel(), t.value().field(lookup.getName()))) != null)
                        break tableScopeLoop;
            }
-            else if ((f = Value.of(t.scopeLevel, t.value.field(lookup.getName()))) != null) {
-                if (found == null || found.scopeLevel < f.scopeLevel) {
+            else if ((f = Value.of(t.scopeLevel(), t.value().field(lookup.getName()))) != null) {
+                if (found == null || found.scopeLevel() < f.scopeLevel()) {
                    found = f;
                }
                else {
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Prior.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java
@ -133,5 +133,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/R2DBC.java
+++ b/jOOQ/src/main/java/org/jooq/impl/R2DBC.java
@ -1052,15 +1052,7 @@ final class R2DBC {
            return new MockArray<>(c.dialect(), (Object[]) nullable(columnIndex, Object.class), Object[].class);
        }

-        private static final class DefaultRow implements Row {
-
-            final Configuration c;
-            final Row           r;
-
-            DefaultRow(Configuration c, Row r) {
-                this.c = c;
-                this.r = r;
-            }
+        private static final /* record */ class DefaultRow implements Row { private final Configuration c; private final Row r; DefaultRow(Configuration c, Row r) { this.c = c; this.r = r; } public Configuration c() { return c; } public Row r() { return r; } @Override public boolean equals(Object o) { if (!(o instanceof DefaultRow)) return false; DefaultRow other = (DefaultRow) o; if (!java.util.Objects.equals(this.c, other.c)) return false; if (!java.util.Objects.equals(this.r, other.r)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.c, this.r); } @Override public String toString() { return new StringBuilder("DefaultRow[").append("c=").append(this.c).append(", r=").append(this.r).append("]").toString(); }

            // These methods are proxied for some drivers that can't convert
            // between data types. See:
@ -1105,15 +1097,7 @@ final class R2DBC {
        }
    }

-    static final class R2DBCResultSetMetaData implements ResultSetMetaData {
-
-        final Configuration c;
-        final RowMetadata   m;
-
-        R2DBCResultSetMetaData(Configuration c, RowMetadata m) {
-            this.c = c;
-            this.m = m;
-        }
+    static final /* record */ class R2DBCResultSetMetaData implements ResultSetMetaData { private final Configuration c; private final RowMetadata m; R2DBCResultSetMetaData(Configuration c, RowMetadata m) { this.c = c; this.m = m; } public Configuration c() { return c; } public RowMetadata m() { return m; } @Override public boolean equals(Object o) { if (!(o instanceof R2DBCResultSetMetaData)) return false; R2DBCResultSetMetaData other = (R2DBCResultSetMetaData) o; if (!java.util.Objects.equals(this.c, other.c)) return false; if (!java.util.Objects.equals(this.m, other.m)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.c, this.m); } @Override public String toString() { return new StringBuilder("R2DBCResultSetMetaData[").append("c=").append(this.c).append(", m=").append(this.m).append("]").toString(); }

        private final ColumnMetadata meta(int column) {
            return m.getColumnMetadata(column - 1);
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Rand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java
@ -193,12 +193,7 @@ final class ResultsImpl extends AbstractList<Result<Record>> implements Results
        return translated;
    }

-    static final class ResultOrRowsImpl implements ResultOrRows {
-
-        private final Result<Record>      result;
-        private final int                 rows;
-        private final DataAccessException exception;
-
+    static final /* record */ class ResultOrRowsImpl implements ResultOrRows { private final Result<Record> result; private final int rows; private final DataAccessException exception; ResultOrRowsImpl(Result<Record> result, int rows, DataAccessException exception) { this.result = result; this.rows = rows; this.exception = exception; } public Result<Record> result() { return result; } public int rows() { return rows; } public DataAccessException exception() { return exception; } @Override public boolean equals(Object o) { if (!(o instanceof ResultOrRowsImpl)) return false; ResultOrRowsImpl other = (ResultOrRowsImpl) o; if (!java.util.Objects.equals(this.result, other.result)) return false; if (!java.util.Objects.equals(this.rows, other.rows)) return false; if (!java.util.Objects.equals(this.exception, other.exception)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.result, this.rows, this.exception); }
        ResultOrRowsImpl(Result<Record> result) {
            this(result, result != null ? result.size() : 0, null);
        }
@ -211,63 +206,6 @@ final class ResultsImpl extends AbstractList<Result<Record>> implements Results
            this(null, 0, exception);
        }

-        private ResultOrRowsImpl(Result<Record> result, int rows, DataAccessException exception) {
-            this.result = result;
-            this.rows = rows;
-            this.exception = exception;
-        }
-
-        @Override
-        public final Result<Record> result() {
-            return result;
-        }
-
-        @Override
-        public final int rows() {
-            return rows;
-        }
-
-        @Override
-        public final DataAccessException exception() {
-            return exception;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int r = 1;
-            r = prime * r + ((exception == null) ? 0 : exception.hashCode());
-            r = prime * r + ((result == null) ? 0 : result.hashCode());
-            r = prime * r + rows;
-            return r;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            ResultOrRowsImpl other = (ResultOrRowsImpl) obj;
-            if (exception == null) {
-                if (other.exception != null)
-                    return false;
-            }
-            else if (!exception.equals(other.exception))
-                return false;
-            if (result == null) {
-                if (other.result != null)
-                    return false;
-            }
-            else if (!result.equals(other.result))
-                return false;
-            if (rows != other.rows)
-                return false;
-            return true;
-        }
-
        @Override
        public String toString() {
            if (exception != null)
--- a/jOOQ/src/main/java/org/jooq/impl/Return.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Return.java
@ -140,5 +140,6 @@ package org.jooq.impl;



+


--- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;

 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.conf.*;
 import org.jooq.impl.*;
 import org.jooq.tools.*;
--- a/Show More
+++ b/Show More