feat: 2.0.90优化range处理

dromara · Oct 9, 2024 · 9865309 · 9865309
1 parent 29902c6
commit 9865309
Show file tree

Hide file tree

Showing 32 changed files with 151 additions and 46 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.82</version>
+    <version>2.0.90</version>
     <name>easy-query</name>
     <description>java object query distributed connector</description>
     <url>https://github.com/xuejmnet/easy-query</url>
@@ -44,7 +44,7 @@
         <module>sql-processor</module>
         <module>sql-ksp-processor</module>
         <!--        以下是不需要deploy到远程仓库的-->
-        <module>sql-test</module>
+<!--        <module>sql-test</module>-->
     </modules>
 
     <properties>

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.82</version>
+        <version>2.0.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...rc/main/java/com/easy/query/core/expression/sql/builder/impl/UpdateExpressionBuilder.java b/...rc/main/java/com/easy/query/core/expression/sql/builder/impl/UpdateExpressionBuilder.java
@@ -52,7 +52,6 @@
 import com.easy.query.core.util.EasyClassUtil;
 import com.easy.query.core.util.EasyCollectionUtil;
 import com.easy.query.core.util.EasySQLSegmentUtil;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 
 import java.util.Collection;
 import java.util.HashMap;

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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-db2/pom.xml b/sql-db-support/sql-db2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sql-kingbase-es</artifactId>

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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-ksp-processor/pom.xml b/sql-ksp-processor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.82</version>
+        <version>2.0.90</version>
     </parent>
 
     <artifactId>sql-ksp-processor</artifactId>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.82</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 

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.82</version>
+        <version>2.0.90</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.82</version>
+        <version>2.0.90</version>
     </parent>
 
     <artifactId>sql-api-proxy</artifactId>

diff --git a/...xy/src/main/java/com/easy/query/core/proxy/predicate/DSLRangeColumnFunctionPredicate.java b/...xy/src/main/java/com/easy/query/core/proxy/predicate/DSLRangeColumnFunctionPredicate.java
@@ -125,12 +125,18 @@ default void rangeClosed(PropTypeColumn<TProperty> valLeft, PropTypeColumn<TProp
      * @return
      */
     default void rangeClosed(boolean conditionLeft, PropTypeColumn<TProperty> valLeft, boolean conditionRight, PropTypeColumn<TProperty> valRight) {
-        ValueFilter valueFilter = getEntitySQLContext().getEntityExpressionBuilder().getExpressionContext().getValueFilter();
-        range(getEntitySQLContext(), this.getTable(), this.getValue(), conditionLeft && valueFilter.accept(this.getTable(), this.getValue(), valLeft), valLeft, conditionRight && valueFilter.accept(this.getTable(), this.getValue(), valRight), valRight, SQLRangeEnum.CLOSED);
+        range(getEntitySQLContext(), this.getTable(), this.getValue(), conditionLeft, valLeft, conditionRight, valRight, SQLRangeEnum.CLOSED);
     }
 
 
     static <TProp> void range(EntitySQLContext entitySQLContext, TableAvailable table, String property, boolean conditionLeft, PropTypeColumn<TProp> valLeft, boolean conditionRight, PropTypeColumn<TProp> valRight, SQLRangeEnum sqlRange) {
+        ValueFilter valueFilter = entitySQLContext.getEntityExpressionBuilder().getExpressionContext().getValueFilter();
+        boolean acceptLeft = valueFilter.accept(table, property, valLeft);
+        boolean acceptRight = valueFilter.accept(table, property, valRight);
+        range0(entitySQLContext, table, property, conditionLeft && acceptLeft, valLeft, conditionRight && acceptRight, valRight, sqlRange);
+    }
+
+    static <TProp> void range0(EntitySQLContext entitySQLContext, TableAvailable table, String property, boolean conditionLeft, PropTypeColumn<TProp> valLeft, boolean conditionRight, PropTypeColumn<TProp> valRight, SQLRangeEnum sqlRange) {
 
         if (conditionLeft && conditionRight) {
             entitySQLContext._whereAnd(() -> {

diff --git a/...rm/sql-api-proxy/src/main/java/com/easy/query/core/proxy/predicate/DSLRangePredicate.java b/...rm/sql-api-proxy/src/main/java/com/easy/query/core/proxy/predicate/DSLRangePredicate.java
@@ -123,11 +123,17 @@ default void rangeClosed(TProperty valLeft, TProperty valRight) {
      * @return
      */
     default void rangeClosed(boolean conditionLeft, TProperty valLeft, boolean conditionRight, TProperty valRight) {
-        ValueFilter valueFilter = getEntitySQLContext().getEntityExpressionBuilder().getExpressionContext().getValueFilter();
-        range(getEntitySQLContext(), this.getTable(), this.getValue(), conditionLeft && valueFilter.accept(this.getTable(), this.getValue(), valLeft), valLeft, conditionRight && valueFilter.accept(this.getTable(), this.getValue(), valRight), valRight, SQLRangeEnum.CLOSED);
+        range(getEntitySQLContext(), this.getTable(), this.getValue(), conditionLeft, valLeft, conditionRight, valRight, SQLRangeEnum.CLOSED);
     }
 
     static <TProp> void range(EntitySQLContext entitySQLContext, TableAvailable table, String property, boolean conditionLeft, TProp valLeft, boolean conditionRight, TProp valRight, SQLRangeEnum sqlRange) {
+        ValueFilter valueFilter = entitySQLContext.getEntityExpressionBuilder().getExpressionContext().getValueFilter();
+        boolean acceptLeft = valueFilter.accept(table, property, valLeft);
+        boolean acceptRight = valueFilter.accept(table, property, valRight);
+        range0(entitySQLContext, table, property, conditionLeft && acceptLeft, valLeft, conditionRight && acceptRight, valRight, sqlRange);
+    }
+
+    static <TProp> void range0(EntitySQLContext entitySQLContext, TableAvailable table, String property, boolean conditionLeft, TProp valLeft, boolean conditionRight, TProp valRight, SQLRangeEnum sqlRange) {
         if (conditionLeft && conditionRight) {
             entitySQLContext._whereAnd(() -> {
                 entitySQLContext.accept(new SQLPredicateImpl(filter -> {

diff --git a/...c/main/java/com/easy/query/core/proxy/predicate/aggregate/DSLRangeAggregatePredicate.java b/...c/main/java/com/easy/query/core/proxy/predicate/aggregate/DSLRangeAggregatePredicate.java
@@ -24,34 +24,35 @@ public interface DSLRangeAggregatePredicate<TProperty> extends DSLRangePredicate
 
     @Override
     default void rangeOpenClosed(boolean conditionLeft, TProperty valLeft, boolean conditionRight, TProperty valRight) {
-        rangeFilter(getEntitySQLContext(),this,conditionLeft,_toFunctionSerializeValue(valLeft),conditionRight,_toFunctionSerializeValue(valRight),SQLRangeEnum.OPEN_CLOSED);
+        rangeFilter(getEntitySQLContext(), this, conditionLeft, _toFunctionSerializeValue(valLeft), conditionRight, _toFunctionSerializeValue(valRight), SQLRangeEnum.OPEN_CLOSED);
     }
 
     @Override
     default void rangeOpen(boolean conditionLeft, TProperty valLeft, boolean conditionRight, TProperty valRight) {
-        rangeFilter(getEntitySQLContext(),this,conditionLeft,_toFunctionSerializeValue(valLeft),conditionRight,_toFunctionSerializeValue(valRight),SQLRangeEnum.OPEN);
+        rangeFilter(getEntitySQLContext(), this, conditionLeft, _toFunctionSerializeValue(valLeft), conditionRight, _toFunctionSerializeValue(valRight), SQLRangeEnum.OPEN);
     }
 
     @Override
     default void rangeClosedOpen(boolean conditionLeft, TProperty valLeft, boolean conditionRight, TProperty valRight) {
-        rangeFilter(getEntitySQLContext(),this,conditionLeft,_toFunctionSerializeValue(valLeft),conditionRight,_toFunctionSerializeValue(valRight),SQLRangeEnum.CLOSED_OPEN);
+        rangeFilter(getEntitySQLContext(), this, conditionLeft, _toFunctionSerializeValue(valLeft), conditionRight, _toFunctionSerializeValue(valRight), SQLRangeEnum.CLOSED_OPEN);
     }
 
     @Override
     default void rangeClosed(boolean conditionLeft, TProperty valLeft, boolean conditionRight, TProperty valRight) {
-
-        rangeFilter(getEntitySQLContext(),this,conditionLeft,_toFunctionSerializeValue(valLeft),conditionRight,_toFunctionSerializeValue(valRight),SQLRangeEnum.CLOSED);
+        rangeFilter(getEntitySQLContext(), this, conditionLeft, _toFunctionSerializeValue(valLeft), conditionRight, _toFunctionSerializeValue(valRight), SQLRangeEnum.CLOSED);
     }
 
 
     static <TProp> void rangeFilter(EntitySQLContext entitySQLContext, DSLSQLFunctionAvailable dslSQLFunction, boolean conditionLeft, TProp valLeft, boolean conditionRight, TProp valRight, SQLRangeEnum sqlRange) {
         ValueFilter valueFilter = entitySQLContext.getEntityExpressionBuilder().getExpressionContext().getValueFilter();
-        rangeFilter0(entitySQLContext,dslSQLFunction,conditionLeft && valueFilter.accept(dslSQLFunction.getTable(), null, valLeft),valLeft,conditionRight && valueFilter.accept(dslSQLFunction.getTable(), null, valRight),valRight,sqlRange);
+        boolean acceptLeft = valueFilter.accept(dslSQLFunction.getTable(), null, valLeft);
+        boolean acceptRight = valueFilter.accept(dslSQLFunction.getTable(), null, valRight);
+        rangeFilter0(entitySQLContext, dslSQLFunction, conditionLeft && acceptLeft, valLeft, conditionRight && acceptRight, valRight, sqlRange);
     }
 
     static <TProp> void rangeFilter0(EntitySQLContext entitySQLContext, DSLSQLFunctionAvailable dslSQLFunction, boolean conditionLeft, TProp valLeft, boolean conditionRight, TProp valRight, SQLRangeEnum sqlRange) {
         if (conditionLeft && conditionRight) {
-            entitySQLContext._whereAnd(()->{
+            entitySQLContext._whereAnd(() -> {
                 entitySQLContext.accept(new SQLAggregatePredicateImpl(filter -> {
                     boolean openFirst = SQLRangeEnum.openFirst(sqlRange);
                     rangeCompareFilter(filter, dslSQLFunction, openFirst ? SQLPredicateCompareEnum.GT : SQLPredicateCompareEnum.GE, valLeft);

diff --git a/...m/easy/query/core/proxy/predicate/aggregate/DSLRangeColumnFunctionAggregatePredicate.java b/...m/easy/query/core/proxy/predicate/aggregate/DSLRangeColumnFunctionAggregatePredicate.java
@@ -1,5 +1,6 @@
 package com.easy.query.core.proxy.predicate.aggregate;
 
+import com.easy.query.core.annotation.Table;
 import com.easy.query.core.enums.SQLPredicateCompareEnum;
 import com.easy.query.core.enums.SQLRangeEnum;
 import com.easy.query.core.expression.builder.AggregateFilter;
@@ -42,12 +43,19 @@ default void rangeClosedOpen(boolean conditionLeft, PropTypeColumn<TProperty> va
 
     @Override
     default void rangeClosed(boolean conditionLeft, PropTypeColumn<TProperty> valLeft, boolean conditionRight, PropTypeColumn<TProperty> valRight) {
-        ValueFilter valueFilter = getEntitySQLContext().getEntityExpressionBuilder().getExpressionContext().getValueFilter();
-        rangeFilter(getEntitySQLContext(), this, conditionLeft && valueFilter.accept(this.getTable(), null, valLeft), valLeft, conditionRight && valueFilter.accept(this.getTable(), null, valRight), valRight, SQLRangeEnum.CLOSED);
+        rangeFilter(getEntitySQLContext(), this, conditionLeft, valLeft, conditionRight, valRight, SQLRangeEnum.CLOSED);
     }
 
 
     static <TProp> void rangeFilter(EntitySQLContext entitySQLContext, DSLSQLFunctionAvailable dslSQLFunction, boolean conditionLeft, PropTypeColumn<TProp> valLeft, boolean conditionRight, PropTypeColumn<TProp> valRight, SQLRangeEnum sqlRange) {
+        ValueFilter valueFilter = entitySQLContext.getEntityExpressionBuilder().getExpressionContext().getValueFilter();
+        boolean acceptLeft = valueFilter.accept(dslSQLFunction.getTable(), null, valLeft);
+        boolean acceptRight = valueFilter.accept(dslSQLFunction.getTable(), null, valRight);
+        rangeFilter0(entitySQLContext, dslSQLFunction, conditionLeft && acceptLeft, valLeft, conditionRight && acceptRight, valRight, sqlRange);
+    }
+
+
+    static <TProp> void rangeFilter0(EntitySQLContext entitySQLContext, DSLSQLFunctionAvailable dslSQLFunction, boolean conditionLeft, PropTypeColumn<TProp> valLeft, boolean conditionRight, PropTypeColumn<TProp> valRight, SQLRangeEnum sqlRange) {
         if (conditionLeft && conditionRight) {
             entitySQLContext._whereAnd(() -> {
                 entitySQLContext.accept(new SQLAggregatePredicateImpl(filter -> {

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

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

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

diff --git a/sql-test/pom.xml b/sql-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>2.0.82</version>
+        <version>2.0.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api4kt</artifactId>
-            <version>2.0.82</version>
+            <version>2.0.90</version>
             <scope>compile</scope>
         </dependency>
         <dependency>