diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractMeta.java b/jOOQ/src/main/java/org/jooq/impl/AbstractMeta.java
index fd4030533b..25b99e53a6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractMeta.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractMeta.java
@@ -288,8 +288,10 @@ abstract class AbstractMeta extends AbstractScope implements Meta, Serializable
         return ddl(new DDLExportConfiguration());
     }
 
+    // [#9396] TODO Fix this. Subclasses should not need to override this to get
+    //         correct results
     @Override
-    public final Queries ddl(DDLExportConfiguration exportConfiguration) throws DataAccessException {
+    public /* non-final */ Queries ddl(DDLExportConfiguration exportConfiguration) throws DataAccessException {
         return new DDL(this, exportConfiguration).queries();
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableMetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableMetaImpl.java
index 5f167f0f0b..ee137c8731 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableMetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableMetaImpl.java
@@ -46,10 +46,13 @@ import java.util.Set;
 
 import org.jooq.Catalog;
 import org.jooq.Configuration;
+import org.jooq.DDLExportConfiguration;
+import org.jooq.Queries;
 import org.jooq.Schema;
 import org.jooq.Sequence;
 import org.jooq.Table;
 import org.jooq.UniqueKey;
+import org.jooq.exception.DataAccessException;
 
 /**
  * @author Lukas Eder
@@ -108,4 +111,9 @@ final class TableMetaImpl extends AbstractMeta {
 
         return result;
     }
+
+    @Override
+    public Queries ddl(DDLExportConfiguration exportConfiguration) throws DataAccessException {
+        return new DDL(this, exportConfiguration).queries(tables);
+    }
 }