diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index c10d9265c7..3cbd451ebf 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -483,6 +483,13 @@ public class GenerationTool {
             if (g.getDatabase().isTableValuedFunctions() != null)
                 generator.setGenerateTableValuedFunctions(g.getDatabase().isTableValuedFunctions());
 
+
+
+
+
+
+
+
             // Generator properties that should in fact be strategy properties
             strategy.setInstanceFields(generator.generateInstanceFields());
 
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd
index 3eeda8d644..c65b284acb 100644
--- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd
@@ -550,9 +550,12 @@
         If this is deactivated, such functions are not generated as tables, but
         as ordinary routines. This is particularly useful for backwards-
         compatibility between jOOQ 3.8 and previous versions, when using TABLE
-        and VARRAY types in Oracle
+        and VARRAY types in Oracle.
+
+        While this flag defaults to true for most databases, it defaults to false
+        for Oracle.
         -->
-      <element name="tableValuedFunctions" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+      <element name="tableValuedFunctions" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
     </all>
   </complexType>