diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index d1c7149a71..da866525db 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -2919,15 +2919,26 @@ public class JavaGenerator extends AbstractGenerator {
 
     protected void printClassAnnotations(JavaWriter out, SchemaDefinition schema) {
         if (generateGeneratedAnnotation()) {
+            out.println("@javax.annotation.Generated(");
+
             if (useSchemaVersionProvider()) {
-                out.println("@javax.annotation.Generated(value    = { \"http://www.jooq.org\", \"jOOQ version:%s\", \"schema version:%s\" },", Constants.VERSION, schemaVersions.get(schema).replace("\"", "\\\""));
-                out.println("                            date     = \"" + isoDate + "\",");
-                out.println("                            comments = \"This class is generated by jOOQ\")");
+                out.tab(1).println("value = {");
+                out.tab(2).println("\"http://www.jooq.org\",");
+                out.tab(2).println("\"jOOQ version:%s\",", Constants.VERSION);
+                out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
+                out.tab(1).println("},");
+                out.tab(1).println("date = \"" + isoDate + "\",");
+                out.tab(1).println("comments = \"This class is generated by jOOQ\"");
             }
             else {
-                out.println("@javax.annotation.Generated(value    = { \"http://www.jooq.org\", \"jOOQ version:%s\" },", Constants.VERSION);
-                out.println("                            comments = \"This class is generated by jOOQ\")");
+                out.tab(1).println("value = {");
+                out.tab(2).println("\"http://www.jooq.org\",");
+                out.tab(2).println("\"jOOQ version:%s\"", Constants.VERSION);
+                out.tab(1).println("},");
+                out.tab(1).println("comments = \"This class is generated by jOOQ\"");
             }
+
+            out.println(")");
         }
 
         out.println("@java.lang.SuppressWarnings({ \"all\", \"unchecked\", \"rawtypes\" })");
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java
index 42c6019858..a62fc2bbfe 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgCatalog extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -547042235;
+	private static final long serialVersionUID = -311127344;
 
 	/**
 	 * The singleton instance of <code>pg_catalog</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java
index b90f23cc96..597f9e28ca 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java
@@ -4,12 +4,15 @@
 package org.jooq.util.postgres.pg_catalog;
 
 /**
- * This class is generated by jOOQ.
- *
  * Convenience access to all stored procedures and functions in pg_catalog
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Routines {
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java
index 75bd69f0b6..b846135685 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java
@@ -4,12 +4,15 @@
 package org.jooq.util.postgres.pg_catalog;
 
 /**
- * This class is generated by jOOQ.
- *
  * Convenience access to all tables in pg_catalog
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Tables {
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java
index e183ae5b53..d82275b971 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count1.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Count1 extends org.jooq.impl.AbstractRoutine<java.lang.Long> {
 
-	private static final long serialVersionUID = 208079261;
+	private static final long serialVersionUID = -1185736664;
 
 	/**
 	 * The parameter <code>pg_catalog.count.RETURN_VALUE</code>.
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java
index 35c7a4e60f..b5ab87f197 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/Count2.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Count2 extends org.jooq.impl.AbstractRoutine<java.lang.Long> {
 
-	private static final long serialVersionUID = -1317511552;
+	private static final long serialVersionUID = 1235202955;
 
 	/**
 	 * The parameter <code>pg_catalog.count.RETURN_VALUE</code>.
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java
index cca086ae9e..7669ca9fe4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class FormatType extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -763218796;
+	private static final long serialVersionUID = -219126807;
 
 	/**
 	 * The parameter <code>pg_catalog.format_type.RETURN_VALUE</code>.
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java
index 79a5d79979..8156fad870 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgAttribute extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 622630497;
+	private static final long serialVersionUID = 1196239094;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_attribute</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java
index 1c79b37d40..c67798761d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgClass extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -554390261;
+	private static final long serialVersionUID = -620129824;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_class</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java
index 11dcec24a3..9125aac8ab 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgCursor.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgCursor extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1972650578;
+	private static final long serialVersionUID = -1196682275;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_cursor</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java
index a53f1d6447..73b1ea83a3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgDescription.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgDescription extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1078340299;
+	private static final long serialVersionUID = 1954654848;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_description</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java
index 5e7899e52b..c0a223cd79 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgEnum extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1493557577;
+	private static final long serialVersionUID = 1218777758;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_enum</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java
index 71d6971427..e158e04bc7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgInherits.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgInherits extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 2110502137;
+	private static final long serialVersionUID = -898167858;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_inherits</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java
index 35f5b49cfe..da90b99e75 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgNamespace extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -238235012;
+	private static final long serialVersionUID = -1235099823;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_namespace</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java
index 10ddd6803f..fbe381bb9a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgProc extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -2023687916;
+	private static final long serialVersionUID = -1495646817;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_proc</code>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java
index c545ea0ed5..5f900449f8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java
@@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "jOOQ version:3.5.0" },
-                            comments = "This class is generated by jOOQ")
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.0"
+	},
+	comments = "This class is generated by jOOQ"
+)
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class PgType extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1535427324;
+	private static final long serialVersionUID = -1569534649;
 
 	/**
 	 * The singleton instance of <code>pg_catalog.pg_type</code>