diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java
index d451eb9320..5681b5499e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QOM.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java
@@ -3182,10 +3182,10 @@ public final class QOM {
     /**
      * The <code>ROW EQ</code> operator.
      */
-    public /*sealed*/ interface RowEq
+    public /*sealed*/ interface RowEq<T extends Row>
         extends
             UReturnsNullOnNullInput,
-            UCommutativeOperator<Row, RowEq>,
+            UCommutativeOperator<T, RowEq<T>>,
             org.jooq.Condition
         //permits
         //    RowEq
@@ -3194,10 +3194,10 @@ public final class QOM {
     /**
      * The <code>ROW NE</code> operator.
      */
-    public /*sealed*/ interface RowNe
+    public /*sealed*/ interface RowNe<T extends Row>
         extends
             UReturnsNullOnNullInput,
-            UCommutativeOperator<Row, RowNe>,
+            UCommutativeOperator<T, RowNe<T>>,
             org.jooq.Condition
         //permits
         //    RowNe
@@ -3206,68 +3206,68 @@ public final class QOM {
     /**
      * The <code>ROW GT</code> operator.
      */
-    public /*sealed*/ interface RowGt
+    public /*sealed*/ interface RowGt<T extends Row>
         extends
             UReturnsNullOnNullInput,
-            UConvertibleOperator<Row, RowGt, RowLt>,
+            UConvertibleOperator<T, RowGt<T>, RowLt<T>>,
             org.jooq.Condition
         //permits
         //    RowGt
     {
         @Override
-        default RowLt $converse() {
-            return new org.jooq.impl.RowLt($arg2(), $arg1());
+        default RowLt<T> $converse() {
+            return new org.jooq.impl.RowLt<>($arg2(), $arg1());
         }
     }
 
     /**
      * The <code>ROW GE</code> operator.
      */
-    public /*sealed*/ interface RowGe
+    public /*sealed*/ interface RowGe<T extends Row>
         extends
             UReturnsNullOnNullInput,
-            UConvertibleOperator<Row, RowGe, RowLe>,
+            UConvertibleOperator<T, RowGe<T>, RowLe<T>>,
             org.jooq.Condition
         //permits
         //    RowGe
     {
         @Override
-        default RowLe $converse() {
-            return new org.jooq.impl.RowLe($arg2(), $arg1());
+        default RowLe<T> $converse() {
+            return new org.jooq.impl.RowLe<>($arg2(), $arg1());
         }
     }
 
     /**
      * The <code>ROW LT</code> operator.
      */
-    public /*sealed*/ interface RowLt
+    public /*sealed*/ interface RowLt<T extends Row>
         extends
             UReturnsNullOnNullInput,
-            UConvertibleOperator<Row, RowLt, RowGt>,
+            UConvertibleOperator<T, RowLt<T>, RowGt<T>>,
             org.jooq.Condition
         //permits
         //    RowLt
     {
         @Override
-        default RowGt $converse() {
-            return new org.jooq.impl.RowGt($arg2(), $arg1());
+        default RowGt<T> $converse() {
+            return new org.jooq.impl.RowGt<>($arg2(), $arg1());
         }
     }
 
     /**
      * The <code>ROW LE</code> operator.
      */
-    public /*sealed*/ interface RowLe
+    public /*sealed*/ interface RowLe<T extends Row>
         extends
             UReturnsNullOnNullInput,
-            UConvertibleOperator<Row, RowLe, RowGe>,
+            UConvertibleOperator<T, RowLe<T>, RowGe<T>>,
             org.jooq.Condition
         //permits
         //    RowLe
     {
         @Override
-        default RowGe $converse() {
-            return new org.jooq.impl.RowGe($arg2(), $arg1());
+        default RowGe<T> $converse() {
+            return new org.jooq.impl.RowGe<>($arg2(), $arg1());
         }
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowEq.java b/jOOQ/src/main/java/org/jooq/impl/RowEq.java
index 73f17a5764..336d3a322f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowEq.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowEq.java
@@ -65,23 +65,23 @@ import java.util.stream.*;
  * The <code>ROW EQ</code> statement.
  */
 @SuppressWarnings({ "unused" })
-final class RowEq
+final class RowEq<T extends Row>
 extends
     AbstractCondition
 implements
-    QOM.RowEq
+    QOM.RowEq<T>
 {
 
-    final Row arg1;
-    final Row arg2;
+    final T arg1;
+    final T arg2;
 
     RowEq(
-        Row arg1,
-        Row arg2
+        T arg1,
+        T arg2
     ) {
 
-        this.arg1 = ((AbstractRow) arg1).convertTo(arg2);
-        this.arg2 = ((AbstractRow) arg2).convertTo(arg1);
+        this.arg1 = (T) ((AbstractRow) arg1).convertTo(arg2);
+        this.arg2 = (T) ((AbstractRow) arg2).convertTo(arg1);
     }
 
     // -------------------------------------------------------------------------
@@ -279,28 +279,28 @@ implements
     // -------------------------------------------------------------------------
 
     @Override
-    public final Row $arg1() {
+    public final T $arg1() {
         return arg1;
     }
 
     @Override
-    public final Row $arg2() {
+    public final T $arg2() {
         return arg2;
     }
 
     @Override
-    public final QOM.RowEq $arg1(Row newValue) {
+    public final QOM.RowEq<T> $arg1(T newValue) {
         return $constructor().apply(newValue, $arg2());
     }
 
     @Override
-    public final QOM.RowEq $arg2(Row newValue) {
+    public final QOM.RowEq<T> $arg2(T newValue) {
         return $constructor().apply($arg1(), newValue);
     }
 
     @Override
-    public final Function2<? super Row, ? super Row, ? extends QOM.RowEq> $constructor() {
-        return (a1, a2) -> new RowEq(a1, a2);
+    public final Function2<? super T, ? super T, ? extends QOM.RowEq<T>> $constructor() {
+        return (a1, a2) -> new RowEq<>(a1, a2);
     }
 
     // -------------------------------------------------------------------------
@@ -309,7 +309,7 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof QOM.RowEq o) {
+        if (that instanceof QOM.RowEq<?> o) {
             return
                 StringUtils.equals($arg1(), o.$arg1()) &&
                 StringUtils.equals($arg2(), o.$arg2())
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowGe.java b/jOOQ/src/main/java/org/jooq/impl/RowGe.java
index d2b17f6ccc..4edde8e901 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowGe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowGe.java
@@ -65,23 +65,23 @@ import java.util.stream.*;
  * The <code>ROW GE</code> statement.
  */
 @SuppressWarnings({ "unused" })
-final class RowGe
+final class RowGe<T extends Row>
 extends
     AbstractCondition
 implements
-    QOM.RowGe
+    QOM.RowGe<T>
 {
 
-    final Row arg1;
-    final Row arg2;
+    final T arg1;
+    final T arg2;
 
     RowGe(
-        Row arg1,
-        Row arg2
+        T arg1,
+        T arg2
     ) {
 
-        this.arg1 = ((AbstractRow) arg1).convertTo(arg2);
-        this.arg2 = ((AbstractRow) arg2).convertTo(arg1);
+        this.arg1 = (T) ((AbstractRow) arg1).convertTo(arg2);
+        this.arg2 = (T) ((AbstractRow) arg2).convertTo(arg1);
     }
 
     // -------------------------------------------------------------------------
@@ -118,28 +118,28 @@ implements
     // -------------------------------------------------------------------------
 
     @Override
-    public final Row $arg1() {
+    public final T $arg1() {
         return arg1;
     }
 
     @Override
-    public final Row $arg2() {
+    public final T $arg2() {
         return arg2;
     }
 
     @Override
-    public final QOM.RowGe $arg1(Row newValue) {
+    public final QOM.RowGe<T> $arg1(T newValue) {
         return $constructor().apply(newValue, $arg2());
     }
 
     @Override
-    public final QOM.RowGe $arg2(Row newValue) {
+    public final QOM.RowGe<T> $arg2(T newValue) {
         return $constructor().apply($arg1(), newValue);
     }
 
     @Override
-    public final Function2<? super Row, ? super Row, ? extends QOM.RowGe> $constructor() {
-        return (a1, a2) -> new RowGe(a1, a2);
+    public final Function2<? super T, ? super T, ? extends QOM.RowGe<T>> $constructor() {
+        return (a1, a2) -> new RowGe<>(a1, a2);
     }
 
     // -------------------------------------------------------------------------
@@ -148,7 +148,7 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof QOM.RowGe o) {
+        if (that instanceof QOM.RowGe<?> o) {
             return
                 StringUtils.equals($arg1(), o.$arg1()) &&
                 StringUtils.equals($arg2(), o.$arg2())
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowGt.java b/jOOQ/src/main/java/org/jooq/impl/RowGt.java
index d0497ad86d..0779c24d10 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowGt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowGt.java
@@ -65,23 +65,23 @@ import java.util.stream.*;
  * The <code>ROW GT</code> statement.
  */
 @SuppressWarnings({ "unused" })
-final class RowGt
+final class RowGt<T extends Row>
 extends
     AbstractCondition
 implements
-    QOM.RowGt
+    QOM.RowGt<T>
 {
 
-    final Row arg1;
-    final Row arg2;
+    final T arg1;
+    final T arg2;
 
     RowGt(
-        Row arg1,
-        Row arg2
+        T arg1,
+        T arg2
     ) {
 
-        this.arg1 = ((AbstractRow) arg1).convertTo(arg2);
-        this.arg2 = ((AbstractRow) arg2).convertTo(arg1);
+        this.arg1 = (T) ((AbstractRow) arg1).convertTo(arg2);
+        this.arg2 = (T) ((AbstractRow) arg2).convertTo(arg1);
     }
 
     // -------------------------------------------------------------------------
@@ -118,28 +118,28 @@ implements
     // -------------------------------------------------------------------------
 
     @Override
-    public final Row $arg1() {
+    public final T $arg1() {
         return arg1;
     }
 
     @Override
-    public final Row $arg2() {
+    public final T $arg2() {
         return arg2;
     }
 
     @Override
-    public final QOM.RowGt $arg1(Row newValue) {
+    public final QOM.RowGt<T> $arg1(T newValue) {
         return $constructor().apply(newValue, $arg2());
     }
 
     @Override
-    public final QOM.RowGt $arg2(Row newValue) {
+    public final QOM.RowGt<T> $arg2(T newValue) {
         return $constructor().apply($arg1(), newValue);
     }
 
     @Override
-    public final Function2<? super Row, ? super Row, ? extends QOM.RowGt> $constructor() {
-        return (a1, a2) -> new RowGt(a1, a2);
+    public final Function2<? super T, ? super T, ? extends QOM.RowGt<T>> $constructor() {
+        return (a1, a2) -> new RowGt<>(a1, a2);
     }
 
     // -------------------------------------------------------------------------
@@ -148,7 +148,7 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof QOM.RowGt o) {
+        if (that instanceof QOM.RowGt<?> o) {
             return
                 StringUtils.equals($arg1(), o.$arg1()) &&
                 StringUtils.equals($arg2(), o.$arg2())
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowLe.java b/jOOQ/src/main/java/org/jooq/impl/RowLe.java
index 04b8bc6603..0991a85e84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowLe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowLe.java
@@ -65,23 +65,23 @@ import java.util.stream.*;
  * The <code>ROW LE</code> statement.
  */
 @SuppressWarnings({ "unused" })
-final class RowLe
+final class RowLe<T extends Row>
 extends
     AbstractCondition
 implements
-    QOM.RowLe
+    QOM.RowLe<T>
 {
 
-    final Row arg1;
-    final Row arg2;
+    final T arg1;
+    final T arg2;
 
     RowLe(
-        Row arg1,
-        Row arg2
+        T arg1,
+        T arg2
     ) {
 
-        this.arg1 = ((AbstractRow) arg1).convertTo(arg2);
-        this.arg2 = ((AbstractRow) arg2).convertTo(arg1);
+        this.arg1 = (T) ((AbstractRow) arg1).convertTo(arg2);
+        this.arg2 = (T) ((AbstractRow) arg2).convertTo(arg1);
     }
 
     // -------------------------------------------------------------------------
@@ -118,28 +118,28 @@ implements
     // -------------------------------------------------------------------------
 
     @Override
-    public final Row $arg1() {
+    public final T $arg1() {
         return arg1;
     }
 
     @Override
-    public final Row $arg2() {
+    public final T $arg2() {
         return arg2;
     }
 
     @Override
-    public final QOM.RowLe $arg1(Row newValue) {
+    public final QOM.RowLe<T> $arg1(T newValue) {
         return $constructor().apply(newValue, $arg2());
     }
 
     @Override
-    public final QOM.RowLe $arg2(Row newValue) {
+    public final QOM.RowLe<T> $arg2(T newValue) {
         return $constructor().apply($arg1(), newValue);
     }
 
     @Override
-    public final Function2<? super Row, ? super Row, ? extends QOM.RowLe> $constructor() {
-        return (a1, a2) -> new RowLe(a1, a2);
+    public final Function2<? super T, ? super T, ? extends QOM.RowLe<T>> $constructor() {
+        return (a1, a2) -> new RowLe<>(a1, a2);
     }
 
     // -------------------------------------------------------------------------
@@ -148,7 +148,7 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof QOM.RowLe o) {
+        if (that instanceof QOM.RowLe<?> o) {
             return
                 StringUtils.equals($arg1(), o.$arg1()) &&
                 StringUtils.equals($arg2(), o.$arg2())
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowLt.java b/jOOQ/src/main/java/org/jooq/impl/RowLt.java
index 1c983f1929..361336e511 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowLt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowLt.java
@@ -65,23 +65,23 @@ import java.util.stream.*;
  * The <code>ROW LT</code> statement.
  */
 @SuppressWarnings({ "unused" })
-final class RowLt
+final class RowLt<T extends Row>
 extends
     AbstractCondition
 implements
-    QOM.RowLt
+    QOM.RowLt<T>
 {
 
-    final Row arg1;
-    final Row arg2;
+    final T arg1;
+    final T arg2;
 
     RowLt(
-        Row arg1,
-        Row arg2
+        T arg1,
+        T arg2
     ) {
 
-        this.arg1 = ((AbstractRow) arg1).convertTo(arg2);
-        this.arg2 = ((AbstractRow) arg2).convertTo(arg1);
+        this.arg1 = (T) ((AbstractRow) arg1).convertTo(arg2);
+        this.arg2 = (T) ((AbstractRow) arg2).convertTo(arg1);
     }
 
     // -------------------------------------------------------------------------
@@ -118,28 +118,28 @@ implements
     // -------------------------------------------------------------------------
 
     @Override
-    public final Row $arg1() {
+    public final T $arg1() {
         return arg1;
     }
 
     @Override
-    public final Row $arg2() {
+    public final T $arg2() {
         return arg2;
     }
 
     @Override
-    public final QOM.RowLt $arg1(Row newValue) {
+    public final QOM.RowLt<T> $arg1(T newValue) {
         return $constructor().apply(newValue, $arg2());
     }
 
     @Override
-    public final QOM.RowLt $arg2(Row newValue) {
+    public final QOM.RowLt<T> $arg2(T newValue) {
         return $constructor().apply($arg1(), newValue);
     }
 
     @Override
-    public final Function2<? super Row, ? super Row, ? extends QOM.RowLt> $constructor() {
-        return (a1, a2) -> new RowLt(a1, a2);
+    public final Function2<? super T, ? super T, ? extends QOM.RowLt<T>> $constructor() {
+        return (a1, a2) -> new RowLt<>(a1, a2);
     }
 
     // -------------------------------------------------------------------------
@@ -148,7 +148,7 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof QOM.RowLt o) {
+        if (that instanceof QOM.RowLt<?> o) {
             return
                 StringUtils.equals($arg1(), o.$arg1()) &&
                 StringUtils.equals($arg2(), o.$arg2())
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowNe.java b/jOOQ/src/main/java/org/jooq/impl/RowNe.java
index 54000f6a2b..eb33b1a2cf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowNe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowNe.java
@@ -65,23 +65,23 @@ import java.util.stream.*;
  * The <code>ROW NE</code> statement.
  */
 @SuppressWarnings({ "unused" })
-final class RowNe
+final class RowNe<T extends Row>
 extends
     AbstractCondition
 implements
-    QOM.RowNe
+    QOM.RowNe<T>
 {
 
-    final Row arg1;
-    final Row arg2;
+    final T arg1;
+    final T arg2;
 
     RowNe(
-        Row arg1,
-        Row arg2
+        T arg1,
+        T arg2
     ) {
 
-        this.arg1 = ((AbstractRow) arg1).convertTo(arg2);
-        this.arg2 = ((AbstractRow) arg2).convertTo(arg1);
+        this.arg1 = (T) ((AbstractRow) arg1).convertTo(arg2);
+        this.arg2 = (T) ((AbstractRow) arg2).convertTo(arg1);
     }
 
     // -------------------------------------------------------------------------
@@ -118,28 +118,28 @@ implements
     // -------------------------------------------------------------------------
 
     @Override
-    public final Row $arg1() {
+    public final T $arg1() {
         return arg1;
     }
 
     @Override
-    public final Row $arg2() {
+    public final T $arg2() {
         return arg2;
     }
 
     @Override
-    public final QOM.RowNe $arg1(Row newValue) {
+    public final QOM.RowNe<T> $arg1(T newValue) {
         return $constructor().apply(newValue, $arg2());
     }
 
     @Override
-    public final QOM.RowNe $arg2(Row newValue) {
+    public final QOM.RowNe<T> $arg2(T newValue) {
         return $constructor().apply($arg1(), newValue);
     }
 
     @Override
-    public final Function2<? super Row, ? super Row, ? extends QOM.RowNe> $constructor() {
-        return (a1, a2) -> new RowNe(a1, a2);
+    public final Function2<? super T, ? super T, ? extends QOM.RowNe<T>> $constructor() {
+        return (a1, a2) -> new RowNe<>(a1, a2);
     }
 
     // -------------------------------------------------------------------------
@@ -148,7 +148,7 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof QOM.RowNe o) {
+        if (that instanceof QOM.RowNe<?> o) {
             return
                 StringUtils.equals($arg1(), o.$arg1()) &&
                 StringUtils.equals($arg2(), o.$arg2())