center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
junjie 2021-05-10 18:42:06 +08:00
commit 6d1110bb1b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -115,7 +115,11 @@ public class ExtractDataService {
Column_Fields = Column_Fields + datasetTableField.getDataeaseName() + "` "; Column_Fields = Column_Fields + datasetTableField.getDataeaseName() + "` ";
switch (datasetTableField.getDeType()){ switch (datasetTableField.getDeType()){
case 0: case 0:
Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`"; if(datasetTableField.getSize() > 65533){
Column_Fields = Column_Fields + "String" + ",`";
}else {
Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`";
}
break; break;
case 1: case 1:
Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`"; Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`";

3
backend/src/main/resources/db/migration/V16__dataset_table_field.sql
View File

@ -1,2 +1,3 @@
ALTER TABLE `dataset_table_field` ADD COLUMN `dataease_name` varchar(255) NOT NULL COMMENT '字段名' AFTER `name`; ALTER TABLE `dataset_table_field` ADD COLUMN `dataease_name` varchar(255) NOT NULL COMMENT '字段名' AFTER `name`;
ALTER TABLE dataset_table_task_log CHANGE COLUMN `task_id` `task_id` VARCHAR(50) NULL COMMENT '任务ID' ; ALTER TABLE dataset_table_task_log CHANGE COLUMN `task_id` `task_id` VARCHAR(50) NULL COMMENT '任务ID' ;
ALTER TABLE `dataset_table_task_log` CHANGE COLUMN `info` `info` LONGTEXT NULL DEFAULT NULL COMMENT '错误信息' ;

2
frontend/pom.xml
View File

@ -44,7 +44,7 @@
</goals> </goals>
<!-- Optional configuration which provides for running any npm command --> <!-- Optional configuration which provides for running any npm command -->
<configuration> <configuration>
<arguments>install</arguments> <arguments>install --force</arguments>
</configuration> </configuration>
</execution> </execution>