diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java
index c0cbe7e441..9e09fd1d40 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq;
 
 
@@ -27,7 +27,7 @@ import org.jooq.impl.CatalogImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class DefaultCatalog extends CatalogImpl {
 
-    private static final long serialVersionUID = 372784610;
+    private static final long serialVersionUID = 121872102;
 
     /**
      * The reference instance of <code></code>
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java
index e8887eaee9..d4c05e1303 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq;
 
 
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java
index 47d69a50a6..4116667f7d 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq;
 
 
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java
index cf41d539da..d93cf890cf 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Public.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq;
 
 
@@ -32,7 +32,7 @@ import org.jooq.impl.SchemaImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Public extends SchemaImpl {
 
-    private static final long serialVersionUID = 2049419090;
+    private static final long serialVersionUID = 1831058638;
 
     /**
      * The reference instance of <code>PUBLIC</code>
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java
index 76f8f83b0d..a12965bf3b 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Tables.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq;
 
 
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
index 9f12274f17..3446734338 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables;
 
 
@@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Actor extends TableImpl<ActorRecord> {
 
-    private static final long serialVersionUID = -84743714;
+    private static final long serialVersionUID = 750251167;
 
     /**
      * The reference instance of <code>PUBLIC.ACTOR</code>
@@ -94,7 +94,7 @@ public class Actor extends TableImpl<ActorRecord> {
     }
 
     private Actor(Name alias, Table<ActorRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
index b1f03b10b1..dbeac0d389 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables;
 
 
@@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Film extends TableImpl<FilmRecord> {
 
-    private static final long serialVersionUID = 1355236294;
+    private static final long serialVersionUID = -1484720109;
 
     /**
      * The reference instance of <code>PUBLIC.FILM</code>
@@ -111,7 +111,7 @@ public class Film extends TableImpl<FilmRecord> {
     }
 
     private Film(Name alias, Table<FilmRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
index 042ba4af43..6a5ae45f33 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables;
 
 
@@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class FilmActor extends TableImpl<FilmActorRecord> {
 
-    private static final long serialVersionUID = 2033141419;
+    private static final long serialVersionUID = 77050042;
 
     /**
      * The reference instance of <code>PUBLIC.FILM_ACTOR</code>
@@ -89,7 +89,7 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
     }
 
     private FilmActor(Name alias, Table<FilmActorRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
index 21338fdc15..6a881083ac 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables;
 
 
@@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Language extends TableImpl<LanguageRecord> {
 
-    private static final long serialVersionUID = -499918273;
+    private static final long serialVersionUID = 30719078;
 
     /**
      * The reference instance of <code>PUBLIC.LANGUAGE</code>
@@ -89,7 +89,7 @@ public class Language extends TableImpl<LanguageRecord> {
     }
 
     private Language(Name alias, Table<LanguageRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java
index 5c3c652f0e..1d3eea99f6 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/ActorRecord.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables.records;
 
 
@@ -27,7 +27,7 @@ import org.jooq.impl.UpdatableRecordImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class ActorRecord extends UpdatableRecordImpl<ActorRecord> implements Record3<Integer, String, String> {
 
-    private static final long serialVersionUID = -313567136;
+    private static final long serialVersionUID = -1161543836;
 
     /**
      * Setter for <code>PUBLIC.ACTOR.ACTORID</code>.
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java
index 56e1be13c3..0374d0695a 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmActorRecord.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables.records;
 
 
@@ -26,7 +26,7 @@ import org.jooq.impl.UpdatableRecordImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class FilmActorRecord extends UpdatableRecordImpl<FilmActorRecord> implements Record2<Integer, Integer> {
 
-    private static final long serialVersionUID = 959404197;
+    private static final long serialVersionUID = 901058849;
 
     /**
      * Setter for <code>PUBLIC.FILM_ACTOR.FILMS_FILMID</code>.
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java
index f5c97b06ac..c19cecc68f 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/FilmRecord.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables.records;
 
 
@@ -29,7 +29,7 @@ import org.jooq.impl.UpdatableRecordImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class FilmRecord extends UpdatableRecordImpl<FilmRecord> implements Record6<Integer, Integer, Year, String, Integer, Integer> {
 
-    private static final long serialVersionUID = 1316289701;
+    private static final long serialVersionUID = 186428841;
 
     /**
      * Setter for <code>PUBLIC.FILM.FILMID</code>.
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java
index 2ed6f66158..b90b277f4a 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/records/LanguageRecord.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.jpa.jooq.tables.records;
 
 
@@ -27,7 +27,7 @@ import org.jooq.impl.UpdatableRecordImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class LanguageRecord extends UpdatableRecordImpl<LanguageRecord> implements Record2<Integer, String> {
 
-    private static final long serialVersionUID = -249889672;
+    private static final long serialVersionUID = 1884033780;
 
     /**
      * Setter for <code>PUBLIC.LANGUAGE.LANGUAGEID</code>.
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java
index 11c0187748..06e60b755d 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java
@@ -11,6 +11,7 @@ import java.util.List;
 import javax.annotation.Generated;
 
 import org.jooq.Catalog;
+import org.jooq.Sequence;
 import org.jooq.Table;
 import org.jooq.example.db.h2.tables.Author;
 import org.jooq.example.db.h2.tables.Book;
@@ -32,7 +33,7 @@ import org.jooq.impl.SchemaImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Public extends SchemaImpl {
 
-    private static final long serialVersionUID = 1733511408;
+    private static final long serialVersionUID = 176668304;
 
     /**
      * The reference instance of <code>PUBLIC</code>
@@ -75,6 +76,18 @@ public class Public extends SchemaImpl {
         return DefaultCatalog.DEFAULT_CATALOG;
     }
 
+    @Override
+    public final List<Sequence<?>> getSequences() {
+        List result = new ArrayList();
+        result.addAll(getSequences0());
+        return result;
+    }
+
+    private final List<Sequence<?>> getSequences0() {
+        return Arrays.<Sequence<?>>asList(
+            Sequences.S_AUTHOR_ID);
+    }
+
     @Override
     public final List<Table<?>> getTables() {
         List result = new ArrayList();
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java
index 2a6861225f..69f93f504a 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java
@@ -1,6 +1,6 @@
 /*
  * This file is generated by jOOQ.
-*/
+ */
 package org.jooq.example.db.h2;
 
 
@@ -27,9 +27,4 @@ public class Sequences {
      * The sequence <code>PUBLIC.S_AUTHOR_ID</code>
      */
     public static final Sequence<Long> S_AUTHOR_ID = new SequenceImpl<Long>("S_AUTHOR_ID", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT);
-
-    /**
-     * The sequence <code>PUBLIC.S_BOOK_ID</code>
-     */
-    public static final Sequence<Long> S_BOOK_ID = new SequenceImpl<Long>("S_BOOK_ID", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT);
 }
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java
index efc8d8277d..c3d65ac1c7 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java
@@ -39,7 +39,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Author extends TableImpl<AuthorRecord> {
 
-    private static final long serialVersionUID = 2144482306;
+    private static final long serialVersionUID = -1556820779;
 
     /**
      * The reference instance of <code>PUBLIC.AUTHOR</code>
@@ -110,7 +110,7 @@ public class Author extends TableImpl<AuthorRecord> {
     }
 
     private Author(Name alias, Table<AuthorRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java
index 0cf017f3ba..cc15015df7 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java
@@ -40,7 +40,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Book extends TableImpl<BookRecord> {
 
-    private static final long serialVersionUID = 1684566543;
+    private static final long serialVersionUID = 478921322;
 
     /**
      * The reference instance of <code>PUBLIC.BOOK</code>
@@ -136,7 +136,7 @@ public class Book extends TableImpl<BookRecord> {
     }
 
     private Book(Name alias, Table<BookRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookStore.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookStore.java
index cf618485dc..b8d2c00920 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookStore.java
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookStore.java
@@ -37,7 +37,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class BookStore extends TableImpl<BookStoreRecord> {
 
-    private static final long serialVersionUID = -247507963;
+    private static final long serialVersionUID = 143732572;
 
     /**
      * The reference instance of <code>PUBLIC.BOOK_STORE</code>
@@ -83,7 +83,7 @@ public class BookStore extends TableImpl<BookStoreRecord> {
     }
 
     private BookStore(Name alias, Table<BookStoreRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookToBookStore.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookToBookStore.java
index d970d88f8b..f806671deb 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookToBookStore.java
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/BookToBookStore.java
@@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
 
-    private static final long serialVersionUID = -1125747411;
+    private static final long serialVersionUID = 417443386;
 
     /**
      * The reference instance of <code>PUBLIC.BOOK_TO_BOOK_STORE</code>
@@ -94,7 +94,7 @@ public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
     }
 
     private BookToBookStore(Name alias, Table<BookToBookStoreRecord> aliased, Field<?>[] parameters) {
-        super(alias, null, aliased, parameters, "");
+        super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
     /**