diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/FetchTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/FetchTests.java
index 668773215b..6b7f4934c6 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/FetchTests.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/FetchTests.java
@@ -44,7 +44,10 @@ import static java.util.Arrays.asList;
 // ...
 import static org.jooq.SQLDialect.H2;
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
+import static org.jooq.SQLDialect.SQLITE;
+// ...
 import static org.jooq.conf.ParamType.INLINED;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.selectOne;
@@ -428,17 +431,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     }
 
     public void testFetchMany() throws Exception {
-        switch (dialect().family()) {
-            /* [pro] xx
-            xxxx xxxxxxx
-            xxxx xxxxxxx
-            xxxx xxxxxxx
-            xx [/pro] */
-            case SQLITE:
-                log.info("SKIPPING", "Fetch Many tests");
-                return;
-        }
-
+        assumeFamilyNotIn(SQLITE);
         List<Result<Record>> results = create().fetchMany(
             "select * from t_book order by " + TBook_ID().getName());
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index 47d4c54d6c..7709dfad2d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -229,6 +229,7 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
                 // [#1260] TODO CUBRID supports this, but there's a JDBC bug
                 /* [pro] xx
                 xxxx xxxx
+                xxxx xxxxxxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxxxxx
                 xx [/pro] */
@@ -332,6 +333,7 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
                 // [#1260] TODO CUBRID supports this, but there's a JDBC bug
                 /* [pro] xx
                 xxxx xxxx
+                xxxx xxxxxxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxxxxx
                 xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index 6665e84e38..22174ffa54 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -217,6 +217,7 @@ class AlterTableImpl extends AbstractQuery implements
 
             switch (family) {
                 /* [pro] xx
+                xxxx xxxxxxxxx
                 xxxx xxxxxxx
                     xxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
                     xxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Concat.java b/jOOQ/src/main/java/org/jooq/impl/Concat.java
index 14845b46a5..cc850a26a6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Concat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Concat.java
@@ -80,6 +80,10 @@ class Concat extends AbstractFunction<String> {
         System.arraycopy(cast, 1, others, 0, others.length);
 
         switch (configuration.dialect().family()) {
+            /* [pro] xx
+            xxxx xxxxxxxxx
+            xx [/pro] */
+
             case MARIADB:
             case MYSQL:
                 return function("concat", SQLDataType.VARCHAR, cast);
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index e6599f72dd..e687808854 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -68,6 +68,7 @@ class CurrentUser extends AbstractFunction<String> {
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
 
             xxxx xxxx
+            xxxx xxxxxxxxx
             xxxx xxxxxxx
                 xxxxxx xxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java
index 14d65c875c..b7f47b1c13 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Values.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Values.java
@@ -99,6 +99,7 @@ class Values<R extends Record> extends AbstractTable<R> {
             // for those dialects that do not support a VALUES() constructor
             /* [pro] xx
             xxxx xxxxxxx
+            xxxx xxxxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx