From 7a22bbd3380edfddd7919b850d04d44c5dc7b7f2 Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 1 Apr 2024 10:50:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E4=BF=9D=E5=AD=98=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=97=B6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BE=93=E5=85=A5=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=A6=82"-"=E3=80=81"."=E7=AD=89=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/datasource/JdbcProvider.java | 4 ++++ .../java/io/dataease/provider/ext/MysqlExtDDLProvider.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index dd12a8fd4a..9d8bc1b4dd 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -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()); } } diff --git a/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java index 9758993090..bf7e178c83 100644 --- a/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java @@ -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())