diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java
index 125dd4639a..18bb527d68 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java
@@ -253,7 +253,7 @@ public interface AlterTableStep {
      * Add an <code>ADD</code> clause with multiple columns or constraints to
      * the <code>ALTER TABLE</code> statement.
      */
-    // @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    // @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     @Support({ H2 })
     AlterTableFinalStep add(FieldOrConstraint... fields);
 
@@ -261,7 +261,7 @@ public interface AlterTableStep {
      * Add an <code>ADD</code> clause with multiple columns or constraints to
      * the <code>ALTER TABLE</code> statement.
      */
-    // @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    // @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     @Support({ H2 })
     AlterTableFinalStep add(Collection<? extends FieldOrConstraint> fields);
 
@@ -493,7 +493,7 @@ public interface AlterTableStep {
      * <p>
      * This is an alias for {@link #dropColumns(Collection)}.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     AlterTableDropStep drop(Field<?>... fields);
 
     /**
@@ -502,7 +502,7 @@ public interface AlterTableStep {
      * <p>
      * This is an alias for {@link #dropColumns(Collection)}.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     AlterTableDropStep drop(Name... fields);
 
     /**
@@ -511,28 +511,28 @@ public interface AlterTableStep {
      * <p>
      * This is an alias for {@link #dropColumns(Collection)}.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     AlterTableDropStep drop(String... fields);
 
     /**
      * Add an <code>DROP COLUMN</code> clause to the <code>ALTER TABLE</code>
      * statement.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     AlterTableDropStep dropColumns(Field<?>... fields);
 
     /**
      * Add an <code>DROP COLUMN</code> clause to the <code>ALTER TABLE</code>
      * statement.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     AlterTableDropStep dropColumns(Name... fields);
 
     /**
      * Add an <code>DROP COLUMN</code> clause to the <code>ALTER TABLE</code>
      * statement.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL })
     AlterTableDropStep dropColumns(String... fields);
 
     /**
@@ -541,14 +541,14 @@ public interface AlterTableStep {
      * <p>
      * This is an alias for {@link #dropColumns(Collection)}.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL })
     AlterTableDropStep drop(Collection<? extends Field<?>> fields);
 
     /**
      * Add an <code>DROP COLUMN</code> clause to the <code>ALTER TABLE</code>
      * statement.
      */
-    @Support({ H2, FIREBIRD, MARIADB, MYSQL, POSTGRES })
+    @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES })
     AlterTableDropStep dropColumns(Collection<? extends Field<?>> fields);
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java
index dfb51e3b21..faab5d5276 100644
--- a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java
@@ -70,34 +70,34 @@ public interface WindowRowsAndStep<T> {
      * Add a <code>... AND UNBOUNDED PRECEDING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> andUnboundedPreceding();
 
     /**
      * Add a <code>... AND [number] PRECEDING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> andPreceding(int number);
 
     /**
      * Add a <code>... AND CURRENT ROW</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> andCurrentRow();
 
     /**
      * Add a <code>... AND UNBOUNDED FOLLOWING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> andUnboundedFollowing();
 
     /**
      * Add a <code>... AND [number] FOLLOWING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> andFollowing(int number);
 }
diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java
index 6fc2a22843..a70b945b45 100644
--- a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java
@@ -71,137 +71,137 @@ public interface WindowRowsStep<T> extends WindowFinalStep<T> {
      * Add a <code>ROWS UNBOUNDED PRECEDING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rowsUnboundedPreceding();
 
     /**
      * Add a <code>ROWS [number] PRECEDING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rowsPreceding(int number);
 
     /**
      * Add a <code>ROWS CURRENT ROW</code> frame clause to the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rowsCurrentRow();
 
     /**
      * Add a <code>ROWS UNBOUNDED FOLLOWING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rowsUnboundedFollowing();
 
     /**
      * Add a <code>ROWS [number] FOLLOWING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rowsFollowing(int number);
 
     /**
      * Add a <code>ROWS BETWEEN UNBOUNDED PRECEDING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rowsBetweenUnboundedPreceding();
 
     /**
      * Add a <code>ROWS BETWEEN [number] PRECEDING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rowsBetweenPreceding(int number);
 
     /**
      * Add a <code>ROWS BETWEEN CURRENT ROW ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rowsBetweenCurrentRow();
 
     /**
      * Add a <code>ROWS BETWEEN UNBOUNDED FOLLOWING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rowsBetweenUnboundedFollowing();
 
     /**
      * Add a <code>ROWS BETWEEN [number] FOLLOWING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rowsBetweenFollowing(int number);
 
     /**
      * Add a <code>RANGE UNBOUNDED PRECEDING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rangeUnboundedPreceding();
 
     /**
      * Add a <code>RANGE [number] PRECEDING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rangePreceding(int number);
 
     /**
      * Add a <code>RANGE CURRENT ROW</code> frame clause to the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rangeCurrentRow();
 
     /**
      * Add a <code>RANGE UNBOUNDED FOLLOWING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rangeUnboundedFollowing();
 
     /**
      * Add a <code>RANGE [number] FOLLOWING</code> frame clause to the window
      * function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowFinalStep<T> rangeFollowing(int number);
 
     /**
      * Add a <code>RANGE BETWEEN UNBOUNDED PRECEDING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rangeBetweenUnboundedPreceding();
 
     /**
      * Add a <code>RANGE BETWEEN [number] PRECEDING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rangeBetweenPreceding(int number);
 
     /**
      * Add a <code>RANGE BETWEEN CURRENT ROW ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rangeBetweenCurrentRow();
 
     /**
      * Add a <code>RANGE BETWEEN UNBOUNDED FOLLOWING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rangeBetweenUnboundedFollowing();
 
     /**
      * Add a <code>RANGE BETWEEN [number] FOLLOWING ...</code> frame clause to
      * the window function.
      */
-    @Support({ POSTGRES, MARIADB, MYSQL_8_0 })
+    @Support({ MARIADB, MYSQL_8_0, POSTGRES })
     WindowRowsAndStep<T> rangeBetweenFollowing(int number);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 9452636227..917f7c9b35 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -8981,7 +8981,7 @@ public class DSL {
      * This allows for full outer joining several table-valued functions on the
      * row number of each function's produced rows.
      */
-    @Support(POSTGRES)
+    @Support({ POSTGRES })
     public static Table<Record> rowsFrom(Table<?>... tables) {
         return new RowsFrom(tables);
     }
@@ -16168,7 +16168,7 @@ public class DSL {
      *
      * @see #power(Field, Field)
      */
-    @Support({ CUBRID, H2, FIREBIRD, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static <T extends Number> Field<T> shr(Field<T> field1, Field<? extends Number> field2) {
         return new Expression<T>(ExpressionOperator.SHR, nullSafe(field1), nullSafe(field2));
     }
@@ -17042,7 +17042,7 @@ public class DSL {
     /**
      * Get the count(distinct field) function.
      */
-    @Support({ CUBRID, DERBY, H2, HSQLDB, FIREBIRD, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static AggregateFunction<Integer> countDistinct(Field<?> field) {
         return new org.jooq.impl.Function<Integer>("count", true, SQLDataType.INTEGER, nullSafe(field));
     }
@@ -17050,7 +17050,7 @@ public class DSL {
     /**
      * Get the count(distinct field) function.
      */
-    @Support({ CUBRID, DERBY, H2, HSQLDB, FIREBIRD, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static AggregateFunction<Integer> countDistinct(SelectFieldOrAsterisk field) {
         return new org.jooq.impl.Function<Integer>("count", true, SQLDataType.INTEGER, field("{0}", field));
     }
@@ -17062,7 +17062,7 @@ public class DSL {
      * {@link SQLDialect#POSTGRES}, then the primary key is used with
      * {@link #count(Field)}, instead.
      */
-    @Support({ CUBRID, DERBY, H2, HSQLDB, FIREBIRD, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static AggregateFunction<Integer> countDistinct(Table<?> table) {
         return new CountTable(table, true);
     }
@@ -17663,7 +17663,7 @@ public class DSL {
      * The <code>mode() within group (oder by [order clause])</code> ordered
      * aggregate function.
      */
-    @Support(POSTGRES_9_4)
+    @Support({ POSTGRES_9_4 })
     public static OrderedAggregateFunctionOfDeferredType mode() {
         return new Mode();
     }