Merge pull request #5328 from dataease/pr@dev@fixdataset

fix: 精简模式导入Excel处理特殊字符
This commit is contained in:
taojinlong 2023-05-25 23:41:28 +08:00 committed by GitHub
commit 0111339aa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,10 +41,7 @@ public class MysqlDDLProvider extends DDLProviderImpl {
strings1[i] = null; strings1[i] = null;
continue; continue;
} }
strings1[i] = strings[i].replace("'", "\\'"); strings1[i] = strings[i].replace("\\", "\\\\").replace("'", "\\'");
if(strings1[i].equals("/")){
strings1[i] = "//";
}
} }
values.append("('").append(UUID.randomUUID()) values.append("('").append(UUID.randomUUID())
.append("','").append(String.join("','", Arrays.asList(strings1))) .append("','").append(String.join("','", Arrays.asList(strings1)))
@ -90,27 +87,19 @@ public class MysqlDDLProvider extends DDLProviderImpl {
break; break;
case 1: case 1:
size = size < 50? 50 : size; size = size < 50? 50 : size;
if (size < 65533) { Column_Fields.append("longtext").append(",`");
Column_Fields.append("varchar(length)".replace("length", String.valueOf(datasetTableField.getSize()))).append(",`");
}else {
Column_Fields.append("longtext").append(",`");
}
break; break;
case 2: case 2:
Column_Fields.append("bigint(20)").append(",`"); Column_Fields.append("bigint(20)").append(",`");
break; break;
case 3: case 3:
Column_Fields.append("varchar(100)").append(",`"); Column_Fields.append("longtext").append(",`");
break; break;
case 4: case 4:
Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(datasetTableField.getSize()))).append(",`"); Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(datasetTableField.getSize()))).append(",`");
break; break;
default: default:
if (size < 65533) { Column_Fields.append("longtext").append(",`");
Column_Fields.append("varchar(length)".replace("length", String.valueOf(datasetTableField.getSize()))).append(",`");
}else {
Column_Fields.append("longtext").append(",`");
}
break; break;
} }
} }