7x31
/
databasir
mirror of https://github.com/vran-dev/databasir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: remove table column comment

This commit is contained in:
vran 2022-06-09 16:47:23 +08:00
parent 1dc0e10210
commit acadf15789
6 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java
View File

@ -41,19 +41,16 @@ public interface DocumentResponseConverter {
List<TableTriggerDocument> triggers); List<TableTriggerDocument> triggers);
TableDocumentResponse.ColumnDocumentResponse of(TableColumnDocument pojo, TableDocumentResponse.ColumnDocumentResponse of(TableColumnDocument pojo,
Integer discussionCount,
String description); String description);
default List<TableDocumentResponse.ColumnDocumentResponse> of( default List<TableDocumentResponse.ColumnDocumentResponse> of(
List<TableColumnDocument> columns, List<TableColumnDocument> columns,
String tableName, String tableName,
Map<String, Integer> discussionCountMapByJoinName,
Map<String, String> descriptionMapByJoinName) { Map<String, String> descriptionMapByJoinName) {
return columns.stream() return columns.stream()
.map(column -> { .map(column -> {
Integer count = discussionCountMapByJoinName.get(tableName + "." + column.getName());
String description = descriptionMapByJoinName.get(tableName + "." + column.getName()); String description = descriptionMapByJoinName.get(tableName + "." + column.getName());
return of(column, count, description); return of(column, description);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -70,7 +67,7 @@ public interface DocumentResponseConverter {
default TableDocumentResponse ofDiff(TableDocDiff table, default TableDocumentResponse ofDiff(TableDocDiff table,
Map<String, Integer> discussionCountMap, Map<String, Integer> discussionCountMap,
Map<String, String> descriptionMap) { Map<String, String> descriptionMap) {
List<TableDocumentResponse.ColumnDocumentResponse> cols = toColumns(table, discussionCountMap, descriptionMap); List<TableDocumentResponse.ColumnDocumentResponse> cols = toColumns(table, descriptionMap);
return ofDiff(table, cols, discussionCountMap, descriptionMap); return ofDiff(table, cols, discussionCountMap, descriptionMap);
} }
@ -83,30 +80,26 @@ public interface DocumentResponseConverter {
Map<String, String> descriptionMap); Map<String, String> descriptionMap);
default List<TableDocumentResponse.ColumnDocumentResponse> toColumns(TableDocDiff table, default List<TableDocumentResponse.ColumnDocumentResponse> toColumns(TableDocDiff table,
Map<String, Integer> discussionCountMap,
Map<String, String> descriptionMap) { Map<String, String> descriptionMap) {
return table.getColumns() return table.getColumns()
.stream() .stream()
.map(col -> toColumn(table.getName(), col, discussionCountMap, descriptionMap)) .map(col -> toColumn(table.getName(), col, descriptionMap))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@Mapping(target = "description", expression = "java(descriptionMap.get(tableName+\".\"+diff.getName()))") @Mapping(target = "description", expression = "java(descriptionMap.get(tableName+\".\"+diff.getName()))")
@Mapping(target = "discussionCount", expression = "java(discussionCountMap.get(tableName+\".\"+diff.getName()))")
@Mapping(target = "original", @Mapping(target = "original",
expression = "java(toOriginalColumn(tableName, diff.getOriginal(), discussionCountMap, descriptionMap))") expression = "java(toOriginalColumn(tableName, diff.getOriginal(), descriptionMap))")
TableDocumentResponse.ColumnDocumentResponse toColumn(String tableName, TableDocumentResponse.ColumnDocumentResponse toColumn(String tableName,
ColumnDocDiff diff, ColumnDocDiff diff,
Map<String, Integer> discussionCountMap,
Map<String, String> descriptionMap); Map<String, String> descriptionMap);
default TableDocumentResponse.ColumnDocumentResponse toOriginalColumn(String tableName, default TableDocumentResponse.ColumnDocumentResponse toOriginalColumn(String tableName,
ColumnDocDiff diff, ColumnDocDiff diff,
Map<String, Integer> discussionCountMap,
Map<String, String> descriptionMap) { Map<String, String> descriptionMap) {
if (diff == null) { if (diff == null) {
return null; return null;
} }
return toColumn(tableName, diff, discussionCountMap, descriptionMap); return toColumn(tableName, diff, descriptionMap);
} }
} }

2
core/src/main/java/com/databasir/core/domain/document/data/TableDocumentResponse.java
View File

@ -74,8 +74,6 @@ public class TableDocumentResponse implements DiffAble<TableDocumentResponse> {
private String defaultValue; private String defaultValue;
private Integer discussionCount;
private LocalDateTime createAt; private LocalDateTime createAt;
private DiffType diffType; private DiffType diffType;

8
core/src/main/java/com/databasir/core/domain/document/diff/DocumentDiffChecker.java
View File

@ -5,10 +5,7 @@ import com.databasir.core.domain.document.data.diff.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -37,6 +34,7 @@ public class DocumentDiffChecker {
.map(curr -> { .map(curr -> {
List<ColumnDocDiff> columnDiffs = List<ColumnDocDiff> columnDiffs =
doDiff(Collections.emptyList(), curr.getColumns(), ColumnDocDiff::getName); doDiff(Collections.emptyList(), curr.getColumns(), ColumnDocDiff::getName);
columnDiffs.sort(Comparator.comparingInt(c -> c.getId()));
List<IndexDocDiff> indexDiffs = List<IndexDocDiff> indexDiffs =
doDiff(Collections.emptyList(), curr.getIndexes(), IndexDocDiff::getName); doDiff(Collections.emptyList(), curr.getIndexes(), IndexDocDiff::getName);
List<TriggerDocDiff> triggerDiffs = List<TriggerDocDiff> triggerDiffs =
@ -65,6 +63,7 @@ public class DocumentDiffChecker {
.map(old -> { .map(old -> {
List<ColumnDocDiff> columnDiffs = List<ColumnDocDiff> columnDiffs =
doDiff(old.getColumns(), Collections.emptyList(), ColumnDocDiff::getName); doDiff(old.getColumns(), Collections.emptyList(), ColumnDocDiff::getName);
columnDiffs.sort(Comparator.comparingInt(c -> c.getId()));
List<IndexDocDiff> indexDiffs = List<IndexDocDiff> indexDiffs =
doDiff(old.getIndexes(), Collections.emptyList(), IndexDocDiff::getName); doDiff(old.getIndexes(), Collections.emptyList(), IndexDocDiff::getName);
List<TriggerDocDiff> triggerDiffs = List<TriggerDocDiff> triggerDiffs =
@ -98,6 +97,7 @@ public class DocumentDiffChecker {
List<ColumnDocDiff> columnDiffs = List<ColumnDocDiff> columnDiffs =
doDiff(originalTable.getColumns(), currentTable.getColumns(), ColumnDocDiff::getName); doDiff(originalTable.getColumns(), currentTable.getColumns(), ColumnDocDiff::getName);
columnDiffs.sort(Comparator.comparingInt(c -> c.getId()));
List<IndexDocDiff> indexDiffs = List<IndexDocDiff> indexDiffs =
doDiff(originalTable.getIndexes(), currentTable.getIndexes(), IndexDocDiff::getName); doDiff(originalTable.getIndexes(), currentTable.getIndexes(), IndexDocDiff::getName);
List<TriggerDocDiff> triggerDiffs = List<TriggerDocDiff> triggerDiffs =

9
core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java
View File

@ -82,7 +82,7 @@ public class DocumentService {
return documentOption.map(document -> { return documentOption.map(document -> {
var discussionCountMapByTableName = var discussionCountMapByTableName =
documentDiscussionDao.selectTableDiscussionCount(projectId) documentDiscussionDao.selectAllDiscussionCount(projectId)
.stream() .stream()
.collect(Collectors.toMap(d -> d.getTableName(), d -> d.getCount(), (a, b) -> a)); .collect(Collectors.toMap(d -> d.getTableName(), d -> d.getCount(), (a, b) -> a));
var descriptionMapByTableName = var descriptionMapByTableName =
@ -218,9 +218,7 @@ public class DocumentService {
var discussions = documentDiscussionDao.selectAllDiscussionCount(projectId); var discussions = documentDiscussionDao.selectAllDiscussionCount(projectId);
Map<String, Integer> discussionCountMapByJoinName = discussions.stream() Map<String, Integer> discussionCountMapByJoinName = discussions.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
d -> String.join(".", d -> d.getTableName(),
d.getTableName(),
StringUtils.defaultIfBlank(d.getColumnName(), "")),
DocumentDiscussionCountPojo::getCount, DocumentDiscussionCountPojo::getCount,
(a, b) -> a)); (a, b) -> a));
@ -246,7 +244,6 @@ public class DocumentService {
var columnResponses = documentResponseConverter.of( var columnResponses = documentResponseConverter.of(
subColumns, subColumns,
table.getName(), table.getName(),
discussionCountMapByJoinName,
descriptionMapByJoinName); descriptionMapByJoinName);
return documentResponseConverter.of( return documentResponseConverter.of(
table, table,
@ -276,7 +273,7 @@ public class DocumentService {
var discussions = documentDiscussionDao.selectAllDiscussionCount(projectId); var discussions = documentDiscussionDao.selectAllDiscussionCount(projectId);
Map<String, Integer> discussionCountMapByJoinName = discussions.stream() Map<String, Integer> discussionCountMapByJoinName = discussions.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
d -> String.join(".", d.getTableName(), d.getColumnName()), d -> d.getTableName(),
DocumentDiscussionCountPojo::getCount, DocumentDiscussionCountPojo::getCount,
(a, b) -> a)); (a, b) -> a));

9
dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java
View File

@ -32,21 +32,16 @@ public class DocumentDiscussionDao extends BaseDao<DocumentDiscussion> {
.fetchOptionalInto(DocumentDiscussion.class); .fetchOptionalInto(DocumentDiscussion.class);
} }
public List<DocumentDiscussionCountPojo> selectTableDiscussionCount(Integer projectId) {
return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)
.and(DOCUMENT_DISCUSSION.COLUMN_NAME.isNull()));
}
public List<DocumentDiscussionCountPojo> selectAllDiscussionCount(Integer projectId) { public List<DocumentDiscussionCountPojo> selectAllDiscussionCount(Integer projectId) {
return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)); return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId));
} }
public List<DocumentDiscussionCountPojo> selectDiscussionCount(Condition condition) { public List<DocumentDiscussionCountPojo> selectDiscussionCount(Condition condition) {
return this.getDslContext() return this.getDslContext()
.select(DSL.count(), DOCUMENT_DISCUSSION.TABLE_NAME, DOCUMENT_DISCUSSION.COLUMN_NAME) .select(DSL.count(), DOCUMENT_DISCUSSION.TABLE_NAME)
.from(DOCUMENT_DISCUSSION) .from(DOCUMENT_DISCUSSION)
.where(condition) .where(condition)
.groupBy(DOCUMENT_DISCUSSION.TABLE_NAME, DOCUMENT_DISCUSSION.COLUMN_NAME) .groupBy(DOCUMENT_DISCUSSION.TABLE_NAME)
.fetchInto(DocumentDiscussionCountPojo.class); .fetchInto(DocumentDiscussionCountPojo.class);
} }
} }

2
dao/src/main/java/com/databasir/dao/value/DocumentDiscussionCountPojo.java
View File

@ -9,7 +9,5 @@ public class DocumentDiscussionCountPojo {
private String tableName; private String tableName;
private String columnName;
private Integer count; private Integer count;
} }