From 779d67338a5074a478448a4700a3f2c5552fa622 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 13 Apr 2022 12:01:54 +0200
Subject: [PATCH] [jOOQ/jOOQ#13446] Add H2_2_0_202 support for UPDATE ..
 RETURNING and DELETE .. RETURNING

---
 jOOQ/src/main/java/org/jooq/DeleteQuery.java  | 12 ++--
 .../java/org/jooq/DeleteReturningStep.java    | 55 ++++++++++---------
 jOOQ/src/main/java/org/jooq/UpdateQuery.java  | 13 +++--
 .../java/org/jooq/UpdateReturningStep.java    | 55 ++++++++++---------
 4 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/DeleteQuery.java b/jOOQ/src/main/java/org/jooq/DeleteQuery.java
index 413ec0bf82..3d4136c18b 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteQuery.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteQuery.java
@@ -44,6 +44,7 @@ package org.jooq;
 // ...
 // ...
 import static org.jooq.SQLDialect.FIREBIRD;
+import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.MARIADB;
 // ...
 import static org.jooq.SQLDialect.MYSQL;
@@ -54,6 +55,7 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 // ...
+import static org.jooq.SQLDialect.YUGABYTEDB;
 
 import java.util.Collection;
 
@@ -162,7 +164,7 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
      *
      * @see #getReturnedRecords()
      */
-    @Support({ FIREBIRD, MARIADB, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     void setReturning();
 
     /**
@@ -172,7 +174,7 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
      * @param fields Fields to be returned
      * @see #getReturnedRecords()
      */
-    @Support({ FIREBIRD, MARIADB, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     void setReturning(SelectFieldOrAsterisk... fields);
 
     /**
@@ -182,7 +184,7 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
      * @param fields Fields to be returned
      * @see #getReturnedRecords()
      */
-    @Support({ FIREBIRD, MARIADB, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     void setReturning(Collection<? extends SelectFieldOrAsterisk> fields);
 
     /**
@@ -205,7 +207,7 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
      * @see #getReturnedRecords()
      */
     @Nullable
-    @Support({ FIREBIRD, MARIADB, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     R getReturnedRecord();
 
     /**
@@ -231,7 +233,7 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
      *         </ul>
      */
     @NotNull
-    @Support({ FIREBIRD, MARIADB, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     Result<R> getReturnedRecords();
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
index 82afcd610f..68ce91a3a1 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
@@ -41,6 +41,7 @@ package org.jooq;
 // ...
 // ...
 import static org.jooq.SQLDialect.FIREBIRD;
+import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.MARIADB;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
@@ -101,7 +102,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     DeleteResultStep<R> returning();
 
     /**
@@ -120,7 +121,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     DeleteResultStep<R> returning(SelectFieldOrAsterisk... fields);
 
     /**
@@ -139,7 +140,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     DeleteResultStep<R> returning(Collection<? extends SelectFieldOrAsterisk> fields);
 
     /**
@@ -152,7 +153,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     DeleteResultStep<Record> returningResult(SelectFieldOrAsterisk... fields);
 
     /**
@@ -165,7 +166,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     DeleteResultStep<Record> returningResult(Collection<? extends SelectFieldOrAsterisk> fields);
 
 
@@ -179,7 +180,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1> DeleteResultStep<Record1<T1>> returningResult(SelectField<T1> field1);
 
     /**
@@ -191,7 +192,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2> DeleteResultStep<Record2<T1, T2>> returningResult(SelectField<T1> field1, SelectField<T2> field2);
 
     /**
@@ -203,7 +204,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3> DeleteResultStep<Record3<T1, T2, T3>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3);
 
     /**
@@ -215,7 +216,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4> DeleteResultStep<Record4<T1, T2, T3, T4>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4);
 
     /**
@@ -227,7 +228,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5> DeleteResultStep<Record5<T1, T2, T3, T4, T5>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5);
 
     /**
@@ -239,7 +240,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6> DeleteResultStep<Record6<T1, T2, T3, T4, T5, T6>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6);
 
     /**
@@ -251,7 +252,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7> DeleteResultStep<Record7<T1, T2, T3, T4, T5, T6, T7>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7);
 
     /**
@@ -263,7 +264,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8> DeleteResultStep<Record8<T1, T2, T3, T4, T5, T6, T7, T8>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8);
 
     /**
@@ -275,7 +276,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9> DeleteResultStep<Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9);
 
     /**
@@ -287,7 +288,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> DeleteResultStep<Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10);
 
     /**
@@ -299,7 +300,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> DeleteResultStep<Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11);
 
     /**
@@ -311,7 +312,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> DeleteResultStep<Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12);
 
     /**
@@ -323,7 +324,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> DeleteResultStep<Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13);
 
     /**
@@ -335,7 +336,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> DeleteResultStep<Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14);
 
     /**
@@ -347,7 +348,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> DeleteResultStep<Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15);
 
     /**
@@ -359,7 +360,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> DeleteResultStep<Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16);
 
     /**
@@ -371,7 +372,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> DeleteResultStep<Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17);
 
     /**
@@ -383,7 +384,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> DeleteResultStep<Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18);
 
     /**
@@ -395,7 +396,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> DeleteResultStep<Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19);
 
     /**
@@ -407,7 +408,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> DeleteResultStep<Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20);
 
     /**
@@ -419,7 +420,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> DeleteResultStep<Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21);
 
     /**
@@ -431,7 +432,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
      * @see DeleteResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, MARIADB, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> DeleteResultStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
 
diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
index 94fe498403..7a95309305 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
@@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.FIREBIRD;
 // ...
 import static org.jooq.SQLDialect.H2;
 // ...
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
@@ -459,7 +460,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      * SQL dialects
      */
     @Override
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     void setReturning();
 
     /**
@@ -469,7 +470,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      * SQL dialects
      */
     @Override
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     void setReturning(Identity<R, ?> identity);
 
     /**
@@ -479,7 +480,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      * SQL dialects
      */
     @Override
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     void setReturning(SelectFieldOrAsterisk... fields);
 
     /**
@@ -489,7 +490,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      * SQL dialects
      */
     @Override
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     void setReturning(Collection<? extends SelectFieldOrAsterisk> fields);
 
     /**
@@ -500,7 +501,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      */
     @Override
     @Nullable
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     R getReturnedRecord();
 
     /**
@@ -511,7 +512,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      */
     @Override
     @NotNull
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     Result<R> getReturnedRecords();
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
index d5c7bedcb3..f480c88798 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
@@ -44,6 +44,7 @@ import org.jetbrains.annotations.*;
 // ...
 // ...
 import static org.jooq.SQLDialect.FIREBIRD;
+import static org.jooq.SQLDialect.H2;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
@@ -105,7 +106,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     UpdateResultStep<R> returning();
 
     /**
@@ -125,7 +126,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     UpdateResultStep<R> returning(SelectFieldOrAsterisk... fields);
 
     /**
@@ -145,7 +146,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     UpdateResultStep<R> returning(Collection<? extends SelectFieldOrAsterisk> fields);
 
     /**
@@ -159,7 +160,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     UpdateResultStep<Record> returningResult(SelectFieldOrAsterisk... fields);
 
     /**
@@ -173,7 +174,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     UpdateResultStep<Record> returningResult(Collection<? extends SelectFieldOrAsterisk> fields);
 
 
@@ -188,7 +189,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1> UpdateResultStep<Record1<T1>> returningResult(SelectField<T1> field1);
 
     /**
@@ -201,7 +202,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2> UpdateResultStep<Record2<T1, T2>> returningResult(SelectField<T1> field1, SelectField<T2> field2);
 
     /**
@@ -214,7 +215,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3> UpdateResultStep<Record3<T1, T2, T3>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3);
 
     /**
@@ -227,7 +228,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4> UpdateResultStep<Record4<T1, T2, T3, T4>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4);
 
     /**
@@ -240,7 +241,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5> UpdateResultStep<Record5<T1, T2, T3, T4, T5>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5);
 
     /**
@@ -253,7 +254,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6> UpdateResultStep<Record6<T1, T2, T3, T4, T5, T6>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6);
 
     /**
@@ -266,7 +267,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7> UpdateResultStep<Record7<T1, T2, T3, T4, T5, T6, T7>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7);
 
     /**
@@ -279,7 +280,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8> UpdateResultStep<Record8<T1, T2, T3, T4, T5, T6, T7, T8>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8);
 
     /**
@@ -292,7 +293,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9> UpdateResultStep<Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9);
 
     /**
@@ -305,7 +306,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> UpdateResultStep<Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10);
 
     /**
@@ -318,7 +319,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> UpdateResultStep<Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11);
 
     /**
@@ -331,7 +332,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> UpdateResultStep<Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12);
 
     /**
@@ -344,7 +345,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> UpdateResultStep<Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13);
 
     /**
@@ -357,7 +358,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> UpdateResultStep<Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14);
 
     /**
@@ -370,7 +371,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> UpdateResultStep<Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15);
 
     /**
@@ -383,7 +384,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> UpdateResultStep<Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16);
 
     /**
@@ -396,7 +397,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> UpdateResultStep<Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17);
 
     /**
@@ -409,7 +410,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> UpdateResultStep<Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18);
 
     /**
@@ -422,7 +423,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> UpdateResultStep<Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19);
 
     /**
@@ -435,7 +436,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> UpdateResultStep<Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20);
 
     /**
@@ -448,7 +449,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> UpdateResultStep<Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21);
 
     /**
@@ -461,7 +462,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
      * @see UpdateResultStep
      */
     @NotNull @CheckReturnValue
-    @Support({ FIREBIRD, POSTGRES, YUGABYTEDB })
+    @Support({ FIREBIRD, H2, POSTGRES, YUGABYTEDB })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> UpdateResultStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);