Merge pull request #987 from tianlu-root/master

fix: function column casing bugfix

Author: scottsut

config/logback.xml

@@ -1,7 +1,7 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
 
     <property name="LOG_HOME" value="./logs"/>
-    <property name ="SQL_LEVEL" value="DEBUG"/>
+    <property name ="SQL_LEVEL" value="INFO"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -39,10 +39,10 @@
         <appender-ref ref="root" />
     </root>
 
-    <logger name="datart.data.provider.jdbc.adapters" level="${SQL_LEVEL}">
+    <logger name="datart.data.provider.jdbc.adapters" level="${SQL_LEVEL}" addtivity="false">
         <appender-ref ref="sql"/>
     </logger>
-    <logger name="datart.data.provider.local.LocalDB" level="${SQL_LEVEL}">
+    <logger name="datart.data.provider.local.LocalDB" level="${SQL_LEVEL}" addtivity="false">
         <appender-ref ref="sql"/>
     </logger>
 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/file-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

data-providers/http-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

data-providers/jdbc-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

data-providers/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/src/main/java/datart/data/provider/calcite/SqlParserUtils.java

@@ -1,6 +1,7 @@
 package datart.data.provider.calcite;
 
 import datart.data.provider.calcite.parser.impl.SqlParserImpl;
+import org.apache.calcite.avatica.util.Casing;
 import org.apache.calcite.avatica.util.Quoting;
 import org.apache.calcite.sql.SqlDialect;
 import org.apache.calcite.sql.SqlNode;
@@ -19,7 +20,10 @@ public static SqlNode parseSnippet(String snippet) throws SqlParseException {
         String sql = String.format(SELECT_SQL, snippet);
         SqlParser.Config config = SqlParser.config()
                 .withParserFactory(SqlParserImpl.FACTORY)
+                .withQuotedCasing(Casing.UNCHANGED)
+                .withUnquotedCasing(Casing.UNCHANGED)
                 .withConformance(SqlConformanceEnum.LENIENT)
+                .withCaseSensitive(true)
                 .withQuoting(Quoting.BRACKET);
         return SqlParser.create(sql, config).parseQuery();
 

pom.xml

@@ -19,7 +19,7 @@
     <groupId>datart</groupId>
     <artifactId>datart-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 
     <dependencies>
         <dependency>

security/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.1</version>
+        <version>1.0.0-beta.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -70,6 +70,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-ldap</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>