diff --git a/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/Routines.java b/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/Routines.java
index cb9a91f7db..56bba06786 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/Routines.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/Routines.java
@@ -11,6 +11,40 @@ package org.jooq.test.postgres.generatedclasses;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Routines {
 
+	/**
+	 * Call <code>public.f</code>
+	 */
+	public static java.lang.Integer f(org.jooq.Configuration configuration, java.lang.Integer f, java.lang.Integer f_) {
+		org.jooq.test.postgres.generatedclasses.routines.F f__ = new org.jooq.test.postgres.generatedclasses.routines.F();
+		f__.setF(f);
+		f__.setF_(f_);
+
+		f__.execute(configuration);
+		return f__.getReturnValue();
+	}
+
+	/**
+	 * Get <code>public.f</code> as a field
+	 */
+	public static org.jooq.Field<java.lang.Integer> f(java.lang.Integer f, java.lang.Integer f_) {
+		org.jooq.test.postgres.generatedclasses.routines.F f__ = new org.jooq.test.postgres.generatedclasses.routines.F();
+		f__.setF(f);
+		f__.setF_(f_);
+
+		return f__.asField();
+	}
+
+	/**
+	 * Get <code>public.f</code> as a field
+	 */
+	public static org.jooq.Field<java.lang.Integer> f(org.jooq.Field<java.lang.Integer> f, org.jooq.Field<java.lang.Integer> f_) {
+		org.jooq.test.postgres.generatedclasses.routines.F f__ = new org.jooq.test.postgres.generatedclasses.routines.F();
+		f__.setF(f);
+		f__.setF_(f_);
+
+		return f__.asField();
+	}
+
 	/**
 	 * Call <code>public.f_arrays</code>
 	 */
@@ -256,6 +290,17 @@ public class Routines {
 		return f.asField();
 	}
 
+	/**
+	 * Call <code>public.p</code>
+	 */
+	public static void p(org.jooq.Configuration configuration, java.lang.Integer p, java.lang.Integer p_) {
+		org.jooq.test.postgres.generatedclasses.routines.P p__ = new org.jooq.test.postgres.generatedclasses.routines.P();
+		p__.setP(p);
+		p__.setP_(p_);
+
+		p__.execute(configuration);
+	}
+
 	/**
 	 * Call <code>public.p_arrays</code>
 	 */
diff --git a/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/routines/F.java b/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/routines/F.java
new file mode 100644
index 0000000000..865937da85
--- /dev/null
+++ b/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/routines/F.java
@@ -0,0 +1,69 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.postgres.generatedclasses.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class F extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
+
+	private static final long serialVersionUID = 1995087668;
+
+	/**
+	 * The parameter <code>public.f.RETURN_VALUE</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> RETURN_VALUE = createParameter("RETURN_VALUE", org.jooq.impl.SQLDataType.INTEGER);
+
+	/**
+	 * The parameter <code>public.f.f</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> F = createParameter("f", org.jooq.impl.SQLDataType.INTEGER);
+
+	/**
+	 * The parameter <code>public.f.f_</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> F_ = createParameter("f_", org.jooq.impl.SQLDataType.INTEGER);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public F() {
+		super("f", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+
+		setReturnParameter(RETURN_VALUE);
+		addInParameter(F);
+		addInParameter(F_);
+	}
+
+	/**
+	 * Set the <code>f</code> parameter IN value to the routine
+	 */
+	public void setF(java.lang.Integer value) {
+		setValue(org.jooq.test.postgres.generatedclasses.routines.F.F, value);
+	}
+
+	/**
+	 * Set the <code>f</code> parameter to the function to be used with a {@link org.jooq.Select} statement
+	 */
+	public F setF(org.jooq.Field<java.lang.Integer> field) {
+		setField(F, field);
+		return this;
+	}
+
+	/**
+	 * Set the <code>f_</code> parameter IN value to the routine
+	 */
+	public void setF_(java.lang.Integer value) {
+		setValue(org.jooq.test.postgres.generatedclasses.routines.F.F_, value);
+	}
+
+	/**
+	 * Set the <code>f_</code> parameter to the function to be used with a {@link org.jooq.Select} statement
+	 */
+	public F setF_(org.jooq.Field<java.lang.Integer> field) {
+		setField(F_, field);
+		return this;
+	}
+}
diff --git a/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/routines/P.java b/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/routines/P.java
new file mode 100644
index 0000000000..df9c1fabdb
--- /dev/null
+++ b/jOOQ-test/src/test/java/org/jooq/test/postgres/generatedclasses/routines/P.java
@@ -0,0 +1,47 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.postgres.generatedclasses.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class P extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
+
+	private static final long serialVersionUID = 1522411883;
+
+	/**
+	 * The parameter <code>public.p.p</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> P = createParameter("p", org.jooq.impl.SQLDataType.INTEGER);
+
+	/**
+	 * The parameter <code>public.p.p_</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> P_ = createParameter("p_", org.jooq.impl.SQLDataType.INTEGER);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public P() {
+		super("p", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+
+		addInParameter(P);
+		addInParameter(P_);
+	}
+
+	/**
+	 * Set the <code>p</code> parameter IN value to the routine
+	 */
+	public void setP(java.lang.Integer value) {
+		setValue(org.jooq.test.postgres.generatedclasses.routines.P.P, value);
+	}
+
+	/**
+	 * Set the <code>p_</code> parameter IN value to the routine
+	 */
+	public void setP_(java.lang.Integer value) {
+		setValue(org.jooq.test.postgres.generatedclasses.routines.P.P_, value);
+	}
+}