refactor: 优化表结构解析

hs-web · Jun 27, 2024 · f773c2d · f773c2d
1 parent 36bdddc
commit f773c2d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...b/src/main/java/org/hswebframework/ezorm/rdb/supports/commons/RDBTableMetadataParser.java b/...b/src/main/java/org/hswebframework/ezorm/rdb/supports/commons/RDBTableMetadataParser.java
@@ -81,6 +81,7 @@ protected Optional<RDBTableMetadata> doParse(String name) {
             .stream()
             .map(record -> {
                 RDBColumnMetadata column = metaData.newColumn();
+                record.getString("table_name").ifPresent(metaData::setRealName);
                 applyColumnInfo(column, record);
                 return column;
             })
@@ -114,8 +115,9 @@ public Mono<RDBTableMetadata> parseByNameReactive(String name) {
                 ReactiveSqlExecutor reactiveSqlExecutor = getReactiveSqlExecutor();
                 //列
                 Mono<List<RDBColumnMetadata>> columns = reactiveSqlExecutor
-                    .select(template(getTableMetaSql(null), param), new RecordResultWrapper())
+                    .select(template(getTableMetaSql(name), param), new RecordResultWrapper())
                     .map(record -> {
+                        record.getString("table_name").ifPresent(metaData::setRealName);
                         RDBColumnMetadata column = metaData.newColumn();
                         applyColumnInfo(column, record);
                         metaData.addColumn(column);
@@ -129,10 +131,11 @@ public Mono<RDBTableMetadata> parseByNameReactive(String name) {
                     .singleOrEmpty();
 
                 //加载索引
-                Flux<RDBIndexMetadata> index = schema.findFeature(IndexMetadataParser.ID)
-                                                     .map(parser -> parser.parseTableIndexReactive(name))
-                                                     .orElseGet(Flux::empty)
-                                                     .doOnNext(metaData::addIndex);
+                Flux<RDBIndexMetadata> index = schema
+                    .findFeature(IndexMetadataParser.ID)
+                    .map(parser -> parser.parseTableIndexReactive(name))
+                    .orElseGet(Flux::empty)
+                    .doOnNext(metaData::addIndex);
 
                 return Flux
                     .merge(columns, comments, index)