diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
index 82f5b56fab..b2e16dee33 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@@ -124,7 +124,7 @@ implements
             case HSQLDB:
             case POSTGRES:
             case YUGABYTEDB:
-                return false;
+                return true;
 
             default:
                 return true;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index eb05550f08..852d5b5307 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -111,7 +111,7 @@ implements
             case HSQLDB:
             case POSTGRES:
             case YUGABYTEDB:
-                return false;
+                return true;
 
             case SQLITE:
                 return false;