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

Merge pull request #8815 from ulleo/dev

Browse Source 
fix(X-Pack): 修复数据填报保存表单创建数据表时无法输入特殊字符如"-"、"."等的问题
This commit is contained in:
ulleo 2024-04-01 10:51:16 +08:00 committed by GitHub
commit 60daef8085
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -83,8 +83,10 @@ public class JdbcProvider extends DefaultJdbcProvider {
try (Connection connection = getConnectionFromPool(datasourceRequest); PreparedStatement stat = getPreparedStatement(connection, queryTimeout, datasourceRequest.getQuery())) {
if (CollectionUtils.isNotEmpty(datasourceRequest.getTableFieldWithValues())) {
LogUtil.info("execWithPreparedStatement sql: " + datasourceRequest.getQuery());
for (int i = 0; i < datasourceRequest.getTableFieldWithValues().size(); i++) {
stat.setObject(i + 1, datasourceRequest.getTableFieldWithValues().get(i).getValue(), datasourceRequest.getTableFieldWithValues().get(i).getType());
LogUtil.info("execWithPreparedStatement param[" + (i + 1) + "]: " + datasourceRequest.getTableFieldWithValues().get(i).getValue());
}
}
@ -428,8 +430,10 @@ public class JdbcProvider extends DefaultJdbcProvider {
try (Connection connection = getConnectionFromPool(dsr); PreparedStatement stat = getPreparedStatement(connection, queryTimeout, dsr.getQuery())) {
if (CollectionUtils.isNotEmpty(dsr.getTableFieldWithValues())) {
LogUtil.info("getData sql: " + dsr.getQuery());
for (int i = 0; i < dsr.getTableFieldWithValues().size(); i++) {
stat.setObject(i + 1, dsr.getTableFieldWithValues().get(i).getValue(), dsr.getTableFieldWithValues().get(i).getType());
LogUtil.info("getData param[" + (i + 1) + "]: " + dsr.getTableFieldWithValues().get(i).getValue());
}
}

4
core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java
View File

@ -288,9 +288,9 @@ public class MysqlExtDDLProvider extends DefaultExtDDLProvider {
}
if (primaryKeyField != null) {
str.append("constraint ")
str.append("constraint `")
.append(table)
.append("_pk ")
.append("_pk` ")
.append("PRIMARY KEY (")
.append("`")
.append(primaryKeyField.getColumnName())