diff --git a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
index 593e8c1232..b81ed33beb 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
@@ -57,6 +57,7 @@ import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLITE;
// ...
// ...
+// ...
/**
* The step in the ALTER TABLE DSL used to ALTER
diff --git a/jOOQ/src/main/java/org/jooq/AlterViewStep.java b/jOOQ/src/main/java/org/jooq/AlterViewStep.java
index 16b3d15580..271ba14078 100644
--- a/jOOQ/src/main/java/org/jooq/AlterViewStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterViewStep.java
@@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.HSQLDB;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
+// ...
import org.jooq.impl.DSL;
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index a5f79af550..95329c5513 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -8461,6 +8461,7 @@ public interface DSLContext extends Scope , AutoCloseable {
* Set the current schema to a new value.
*
* @see DSL#schema(Name)
+ * @see DSL#setSchema(String)
*/
@Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
Query setSchema(String schema);
@@ -8469,12 +8470,15 @@ public interface DSLContext extends Scope , AutoCloseable {
* Set the current schema to a new value.
*
* @see DSL#schema(Name)
+ * @see DSL#setSchema(Name)
*/
@Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
Query setSchema(Name schema);
/**
* Set the current schema to a new value.
+ *
+ * @see DSL#setSchema(Schema)
*/
@Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
Query setSchema(Schema schema);
diff --git a/jOOQ/src/main/java/org/jooq/DropSchemaStep.java b/jOOQ/src/main/java/org/jooq/DropSchemaStep.java
index e402e9976b..89a5bfadf5 100644
--- a/jOOQ/src/main/java/org/jooq/DropSchemaStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropSchemaStep.java
@@ -40,6 +40,7 @@ package org.jooq;
// ...
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.SQLDialect.POSTGRES;
+// ...
/**
* The step in the DROP SCHEMA DSL used to specify
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
index 2a3ecac81a..11a0da5118 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
@@ -40,6 +40,7 @@ package org.jooq.impl;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
+// ...
import static org.jooq.impl.DSL.comment;
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.Keywords.K_ALTER_TABLE;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index a0f0e8f47e..6959efb311 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -6529,6 +6529,7 @@ public class DSL {
* Set the current schema to a new value.
*
* @see DSL#schema(Name)
+ * @see DSLContext#setSchema(String)
*/
@Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
public static Query setSchema(String schema) {
@@ -6539,6 +6540,7 @@ public class DSL {
* Set the current schema to a new value.
*
* @see DSL#schema(Name)
+ * @see DSLContext#setSchema(Name)
*/
@Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
public static Query setSchema(Name schema) {
@@ -6547,6 +6549,8 @@ public class DSL {
/**
* Set the current schema to a new value.
+ *
+ * @see DSLContext#setSchema(Schema)
*/
@Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
public static Query setSchema(Schema schema) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
index 89cbb9dbc2..9083384d41 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
@@ -83,6 +83,7 @@ final class SetSchema extends AbstractRowCountQuery {
+
case POSTGRES:
ctx.visit(K_SET).sql(' ').visit(K_SEARCH_PATH).sql(" = ").visit(schema);
break;