feat: 2.0.7

dromara · May 13, 2024 · 32ba8ce · 32ba8ce
1 parent 87d554a
commit 32ba8ce
Show file tree

Hide file tree

Showing 36 changed files with 130 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.easy-query</groupId>
     <artifactId>easy-query-all</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.6</version>
+    <version>2.0.7</version>
     <name>easy-query</name>
     <description>java object query distributed connector</description>
     <url>https://github.com/xuejmnet/easy-query</url>

diff --git a/samples/console-demo/pom.xml b/samples/console-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>samples</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>console-demo</artifactId>
@@ -22,21 +22,21 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-mysql</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <!-- apt生成代理类 -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <!-- 代理api -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api-proxy</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <!-- mysql驱动 -->

diff --git a/samples/easy-query-solon-web/pom.xml b/samples/easy-query-solon-web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>samples</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <groupId>com.easy.query.solon</groupId>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-solon-plugin</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/samples/multi-datasource-demo/pom.xml b/samples/multi-datasource-demo/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/samples/solon-sharding-demo/pom.xml b/samples/solon-sharding-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>samples</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <groupId>com.easy.query</groupId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-solon-plugin</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/samples/spring-sharding-demo/pom.xml b/samples/spring-sharding-demo/pom.xml
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/samples/springbootdemo/pom.xml b/samples/springbootdemo/pom.xml
@@ -62,13 +62,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
         <!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.alibaba/druid &ndash;&gt;-->
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-cache</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/sql-core/pom.xml b/sql-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sql-db-support/pom.xml b/sql-db-support/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>sql-db-support</artifactId>

diff --git a/sql-db-support/sql-clickhouse/pom.xml b/sql-db-support/sql-clickhouse/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-dameng/pom.xml b/sql-db-support/sql-dameng/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-gauss-db/pom.xml b/sql-db-support/sql-gauss-db/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-h2/pom.xml b/sql-db-support/sql-h2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-kingbase-es/pom.xml b/sql-db-support/sql-kingbase-es/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sql-kingbase-es</artifactId>

diff --git a/...ingbase-es/src/main/java/com/easy/query/kingbase/es/func/KingbaseESConcatSQLFunction.java b/...ingbase-es/src/main/java/com/easy/query/kingbase/es/func/KingbaseESConcatSQLFunction.java
@@ -1,7 +1,6 @@
 package com.easy.query.kingbase.es.func;
 
 import com.easy.query.core.expression.parser.core.available.TableAvailable;
-import com.easy.query.core.expression.parser.core.base.scec.core.SQLNativeChainExpressionContext;
 import com.easy.query.core.func.column.ColumnExpression;
 import com.easy.query.core.func.def.AbstractExpressionSQLFunction;
 import com.easy.query.core.util.EasyCollectionUtil;
@@ -28,7 +27,8 @@ public KingbaseESConcatSQLFunction(List<ColumnExpression> concatExpressions) {
     @Override
     public String sqlSegment(TableAvailable defaultTable) {
         Iterable<String> params = EasyCollectionUtil.select(columnExpressions, (t, i) ->i==0?"{" + i + "}::TEXT": "{" + i + "}");
-        return String.format("%s", String.join(" || ", params));
+//        return String.format("%s", String.join(" || ", params));
+        return String.format("CONCAT(%s)", String.join(",", params));
     }
 
     @Override

diff --git a/sql-db-support/sql-mssql/pom.xml b/sql-db-support/sql-mssql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-mysql/pom.xml b/sql-db-support/sql-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-oracle/pom.xml b/sql-db-support/sql-oracle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-pgsql/pom.xml b/sql-db-support/sql-pgsql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-sqlite/pom.xml b/sql-db-support/sql-sqlite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/pom.xml b/sql-extension/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>sql-extension</artifactId>

diff --git a/sql-extension/sql-cache/pom.xml b/sql-extension/sql-cache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/sql-kt-springboot-starter/pom.xml b/sql-extension/sql-kt-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/sql-solon-plugin/pom.xml b/sql-extension/sql-solon-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/sql-springboot-starter/pom.xml b/sql-extension/sql-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-platform/pom.xml b/sql-platform/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>sql-platform</artifactId>

diff --git a/sql-platform/sql-api-proxy/pom.xml b/sql-platform/sql-api-proxy/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>sql-platform</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>sql-api-proxy</artifactId>

diff --git a/...in/java/com/easy/query/core/proxy/extension/functions/entry/ConcatExpressionSelector.java b/...in/java/com/easy/query/core/proxy/extension/functions/entry/ConcatExpressionSelector.java
@@ -1,5 +1,6 @@
 package com.easy.query.core.proxy.extension.functions.entry;
 
+import com.easy.query.core.basic.api.select.Query;
 import com.easy.query.core.proxy.PropTypeColumn;
 
 /**
@@ -16,6 +17,20 @@ public interface ConcatExpressionSelector {
      */
     ConcatExpressionSelector value(String val);
 
+    /**
+     * 格式化处理
+     * @param valFormat
+     * @return
+     */
+    ConcatExpressionSelector format(Object valFormat);
+
+    /**
+     * 接受子查询
+     * @param subQuery
+     * @return
+     */
+    ConcatExpressionSelector subQuery(Query<?> subQuery);
+
 
     /**
      * 可以是函数也可以是列

diff --git a/...ava/com/easy/query/core/proxy/extension/functions/entry/ConcatExpressionSelectorImpl.java b/...ava/com/easy/query/core/proxy/extension/functions/entry/ConcatExpressionSelectorImpl.java
@@ -1,5 +1,6 @@
 package com.easy.query.core.proxy.extension.functions.entry;
 
+import com.easy.query.core.basic.api.select.Query;
 import com.easy.query.core.func.SQLFunc;
 import com.easy.query.core.func.SQLFunction;
 import com.easy.query.core.func.column.ColumnFuncSelector;
@@ -27,6 +28,18 @@ public ConcatExpressionSelector value(String val) {
         return this;
     }
 
+    @Override
+    public ConcatExpressionSelector format(Object valFormat) {
+        columnFuncSelector.format(valFormat);
+        return this;
+    }
+
+    @Override
+    public ConcatExpressionSelector subQuery(Query<?> subQuery) {
+        columnFuncSelector.subQuery(subQuery);
+        return this;
+    }
+
     @Override
     public ConcatExpressionSelector expression(PropTypeColumn<String> propTypeColumn) {
         if(propTypeColumn instanceof DSLSQLFunctionAvailable){