diff --git a/chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java b/chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java
index bc256068..4020f25e 100644
--- a/chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java
+++ b/chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java
@@ -1,11 +1,5 @@
 package ai.chat2db.plugin.dm;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.stream.Collectors;
-
 import ai.chat2db.plugin.dm.builder.DMSqlBuilder;
 import ai.chat2db.plugin.dm.type.DMColumnTypeEnum;
 import ai.chat2db.plugin.dm.type.DMDefaultValueEnum;
@@ -16,11 +10,16 @@ import ai.chat2db.spi.jdbc.DefaultMetaService;
 import ai.chat2db.spi.model.*;
 import ai.chat2db.spi.sql.SQLExecutor;
 import ai.chat2db.spi.util.SortUtils;
-import ai.chat2db.spi.util.SqlUtils;
 import com.google.common.collect.Lists;
 import jakarta.validation.constraints.NotEmpty;
 import org.apache.commons.lang3.StringUtils;
 
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.stream.Collectors;
+
 public class DMMetaData extends DefaultMetaService implements MetaData {
 
     private List<String> systemSchemas = Arrays.asList("CTISYS", "SYS","SYSDBA","SYSSSO","SYSAUDITOR");
@@ -30,15 +29,28 @@ public class DMMetaData extends DefaultMetaService implements MetaData {
         List<Schema> schemas = SQLExecutor.getInstance().schemas(connection, databaseName, null);
         return SortUtils.sortSchema(schemas, systemSchemas);
     }
+      private String format(String tableName){
+        return "\"" + tableName + "\"";
+      }
+
     public String tableDDL(Connection connection, String databaseName, String schemaName, String tableName) {
-        String selectObjectDDLSQL = String.format(
-            "select dbms_metadata.get_ddl(%s, %s, %s) AS \"sql\" from dual",
-            SqlUtils.formatSQLString("TABLE"), SqlUtils.formatSQLString(tableName),
-            SqlUtils.formatSQLString(schemaName));
+        String sql = """
+                     SELECT
+                         (SELECT comments FROM user_tab_comments WHERE table_name = '%s') AS comments,
+                         (SELECT dbms_metadata.get_ddl('TABLE', '%s', '%s') FROM dual) AS ddl
+                     FROM dual;
+                     """;
+        String selectObjectDDLSQL = String.format(sql, tableName, tableName, schemaName);
         return SQLExecutor.getInstance().execute(connection, selectObjectDDLSQL, resultSet -> {
             try {
                 if (resultSet.next()) {
-                    return resultSet.getString("sql");
+                    String ddl = resultSet.getString("ddl");
+                    String comment = resultSet.getString("comments");
+                    if (StringUtils.isNotBlank(comment)) {
+                        return ddl +"\n"+ "COMMENT ON TABLE " + format(schemaName) + "." + format(tableName) +
+                                " IS " + "'" + comment + "';";
+                    }
+                    return ddl;
                 }
             } catch (SQLException e) {
                 throw new RuntimeException(e);