From 9e9718e782246ad5890672e69f9d460fe8bb3c0a Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 2 Sep 2024 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96calcite=E7=9A=84null=E5=80=BC=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/datasource/provider/CalciteProvider.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index 98af3ba8fa..f797243a73 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -19,6 +19,8 @@ import io.dataease.utils.*; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.apache.calcite.adapter.jdbc.JdbcSchema; +import org.apache.calcite.config.CalciteConnectionProperty; +import org.apache.calcite.config.NullCollation; import org.apache.calcite.jdbc.CalciteConnection; import org.apache.calcite.schema.Schema; import org.apache.calcite.schema.SchemaPlus; @@ -716,11 +718,12 @@ public class CalciteProvider extends Provider { private Connection getCalciteConnection() { registerDriver(); Properties info = new Properties(); - info.setProperty("lex", "JAVA"); - info.setProperty("fun", "all"); - info.setProperty("caseSensitive", "false"); + info.setProperty(CalciteConnectionProperty.LEX.camelName(), "JAVA"); + info.setProperty(CalciteConnectionProperty.FUN.camelName(), "all"); + info.setProperty(CalciteConnectionProperty.CASE_SENSITIVE.camelName(), "false"); + info.setProperty(CalciteConnectionProperty.PARSER_FACTORY.camelName(), "org.apache.calcite.sql.parser.impl.SqlParserImpl#FACTORY"); + info.setProperty(CalciteConnectionProperty.DEFAULT_NULL_COLLATION.camelName(), NullCollation.LAST.name()); info.setProperty("remarks", "true"); - info.setProperty("parserFactory", "org.apache.calcite.sql.parser.impl.SqlParserImpl#FACTORY"); Connection connection = null; try { Class.forName("org.apache.calcite.jdbc.Driver");