From 367550df23e5fd597f6c47d302948a47f72ce692 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 30 Oct 2024 17:27:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=20=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86Doris?= =?UTF-8?q?=E5=85=B3=E8=81=94excel=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/provider/H2EngineProvider.java | 15 +++------------ .../datasource/provider/MysqlEngineProvider.java | 4 ++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java index 9a4d737cba..e3c7a6bdf0 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java @@ -84,15 +84,10 @@ public class H2EngineProvider extends EngineProvider { int size = tableField.getPrecision() * 4; switch (tableField.getDeType()) { case 0: - Column_Fields.append("longtext").append(",`"); + Column_Fields.append("varchar(2048)").append(",`"); break; case 1: - size = size < 50 ? 50 : size; - if (size < 65533) { - Column_Fields.append("varchar(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); - } else { - Column_Fields.append("longtext").append(",`"); - } + Column_Fields.append("varchar(2048)").append(",`"); break; case 2: Column_Fields.append("bigint(20)").append(",`"); @@ -104,11 +99,7 @@ public class H2EngineProvider extends EngineProvider { Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); break; default: - if (size < 65533) { - Column_Fields.append("varchar(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); - } else { - Column_Fields.append("longtext").append(",`"); - } + Column_Fields.append("varchar(2048)").append(",`"); break; } } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java index e3f454f5d2..3dddaee3c7 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java @@ -89,7 +89,7 @@ public class MysqlEngineProvider extends EngineProvider { int size = tableField.getPrecision() * 4; switch (tableField.getDeExtractType()) { case 0: - Column_Fields.append("longtext").append(",`"); + Column_Fields.append("varchar(2048)").append(",`"); break; case 1: Column_Fields.append("datetime").append(",`"); @@ -104,7 +104,7 @@ public class MysqlEngineProvider extends EngineProvider { Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); break; default: - Column_Fields.append("longtext").append(",`"); + Column_Fields.append("varchar(2048)").append(",`"); break; } }