From e46644534d04a2a8b02686be46bb46b55f8ac070 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 10 May 2021 18:19:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86doris=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/ExtractDataService.java | 6 +++++- .../resources/db/migration/V16__dataset_table_field.sql | 3 ++- frontend/pom.xml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 78620eba60..52b9cf2a2f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -115,7 +115,11 @@ public class ExtractDataService { Column_Fields = Column_Fields + datasetTableField.getDataeaseName() + "` "; switch (datasetTableField.getDeType()){ 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; case 1: Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`"; diff --git a/backend/src/main/resources/db/migration/V16__dataset_table_field.sql b/backend/src/main/resources/db/migration/V16__dataset_table_field.sql index 0db94c6dd4..3010a063a9 100644 --- a/backend/src/main/resources/db/migration/V16__dataset_table_field.sql +++ b/backend/src/main/resources/db/migration/V16__dataset_table_field.sql @@ -1,2 +1,3 @@ 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' ; \ No newline at end of file +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 '错误信息' ; diff --git a/frontend/pom.xml b/frontend/pom.xml index c5583f25ef..a157912bb4 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -44,7 +44,7 @@ - install + install --force