1.6.1 修复bank和notbank empty和notempty的bug

dromara · Nov 2, 2023 · 5e77b71 · 5e77b71
1 parent ed477db
commit 5e77b71
Show file tree

Hide file tree

Showing 35 changed files with 168 additions and 55 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>1.6.0</version>
+    <version>1.6.1</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>1.6.0</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>console-demo</artifactId>
@@ -22,21 +22,21 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-mysql</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <!-- apt生成代理类 -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <!-- 代理api -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api-proxy</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</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>1.6.0</version>
+        <version>1.6.1</version>
     </parent>
 
     <groupId>com.easy.query.solon</groupId>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-solon-plugin</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <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>1.6.0</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</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>1.6.0</version>
+        <version>1.6.1</version>
     </parent>
 
     <groupId>com.easy.query</groupId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-solon-plugin</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</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>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/samples/springbootdemo/pom.xml b/samples/springbootdemo/pom.xml
@@ -74,19 +74,19 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-core</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api4j</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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>1.6.0</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sql-core/src/main/java/com/easy/query/core/expression/builder/Filter.java b/sql-core/src/main/java/com/easy/query/core/expression/builder/Filter.java
@@ -416,6 +416,7 @@ default Filter lt(TableAvailable tableLeft, SQLFunction sqlFunctionLeft, TableAv
 
     Filter funcColumnFilter(TableAvailable tableLeft, SQLFunction sqlFunctionLeft, TableAvailable tableRight, SQLFunction sqlFunctionRight, SQLPredicateCompare sqlPredicateCompare);
 
+
     //endregion
     Filter and();
 

diff --git a/sql-core/src/main/java/com/easy/query/core/expression/parser/core/base/WherePredicate.java b/sql-core/src/main/java/com/easy/query/core/expression/parser/core/base/WherePredicate.java
@@ -17,6 +17,8 @@
 import com.easy.query.core.expression.parser.core.base.core.filter.SubQueryPredicate;
 import com.easy.query.core.expression.parser.core.base.core.filter.ValuePredicate;
 import com.easy.query.core.expression.parser.core.base.core.filter.ValuesPredicate;
+import com.easy.query.core.expression.parser.core.base.scec.core.SQLNativeChainExpressionContextImpl;
+import com.easy.query.core.func.SQLFunction;
 
 /**
  * @author xuejiaming
@@ -88,30 +90,42 @@ default <T2> WherePredicate<T1> or(WherePredicate<T2> t2WherePredicate, SQLExpre
     @Override
     default WherePredicate<T1> isBank(boolean condition, String property) {
         if (condition) {
-            getFilter().eq(getTable(), fx().bank(property), "");
+            SQLFunction bank = fx().bank(property);
+            getFilter().sqlNativeSegment(bank.sqlSegment(getTable()),c->{
+                bank.consume(new SQLNativeChainExpressionContextImpl(getTable(),c));
+            });
         }
         return this;
     }
 
     @Override
     default WherePredicate<T1> isNotBank(boolean condition, String property) {
         if (condition) {
-            getFilter().ne(getTable(), fx().bank(property), "");
+            SQLFunction bank = fx().notBank(property);
+            getFilter().sqlNativeSegment(bank.sqlSegment(getTable()),c->{
+                bank.consume(new SQLNativeChainExpressionContextImpl(getTable(),c));
+            });
         }
         return this;
     }
     @Override
     default WherePredicate<T1> isEmpty(boolean condition, String property) {
         if (condition) {
-            getFilter().eq(getTable(), fx().empty(property), "");
+            SQLFunction bank = fx().empty(property);
+            getFilter().sqlNativeSegment(bank.sqlSegment(getTable()),c->{
+                bank.consume(new SQLNativeChainExpressionContextImpl(getTable(),c));
+            });
         }
         return this;
     }
 
     @Override
     default WherePredicate<T1> isNotEmpty(boolean condition, String property) {
         if (condition) {
-            getFilter().ne(getTable(), fx().empty(property), "");
+            SQLFunction bank = fx().notEmpty(property);
+            getFilter().sqlNativeSegment(bank.sqlSegment(getTable()),c->{
+                bank.consume(new SQLNativeChainExpressionContextImpl(getTable(),c));
+            });
         }
         return this;
     }

diff --git a/...ava/com/easy/query/core/expression/sql/builder/internal/ExpressionContextInterceptor.java b/...ava/com/easy/query/core/expression/sql/builder/internal/ExpressionContextInterceptor.java
@@ -54,6 +54,12 @@ public boolean useContains(String name){
         }
         return useInterceptors.contains(name);
     }
+
+    /**
+     * 不代表不包含,表示不使用的拦截器里面是否包含
+     * @param name
+     * @return
+     */
     public boolean noContains(String name){
         if(noInterceptors==null){
             return false;

diff --git a/sql-core/src/main/java/com/easy/query/core/func/SQLFunc.java b/sql-core/src/main/java/com/easy/query/core/func/SQLFunc.java
@@ -7,6 +7,8 @@
 import com.easy.query.core.func.column.ColumnFuncSelectorImpl;
 import com.easy.query.core.func.def.impl.BankSQLFunction;
 import com.easy.query.core.func.def.impl.EmptySQLFunction;
+import com.easy.query.core.func.def.impl.NotBankSQLFunction;
+import com.easy.query.core.func.def.impl.NotEmptySQLFunction;
 import com.easy.query.core.util.EasyArrayUtil;
 
 import java.util.ArrayList;
@@ -212,8 +214,14 @@ default SQLFunction concat(SQLExpression1<ColumnFuncSelector> sqlExpression) {
     default SQLFunction bank(String property){
         return new BankSQLFunction(property);
     }
+    default SQLFunction notBank(String property){
+        return new NotBankSQLFunction(property);
+    }
 
     default SQLFunction empty(String property){
         return new EmptySQLFunction(property);
     }
+    default SQLFunction notEmpty(String property){
+        return new NotEmptySQLFunction(property);
+    }
 }
diff --git a/sql-core/src/main/java/com/easy/query/core/func/def/impl/NotBankSQLFunction.java b/sql-core/src/main/java/com/easy/query/core/func/def/impl/NotBankSQLFunction.java
@@ -0,0 +1,35 @@
+package com.easy.query.core.func.def.impl;
+
+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.def.AbstractSQLFunction;
+
+/**
+ * create time 2023/10/28 15:00
+ * 文件说明
+ *
+ * @author xuejiaming
+ */
+public class NotBankSQLFunction extends AbstractSQLFunction {
+    private final String property;
+
+    public NotBankSQLFunction(String property) {
+
+        this.property = property;
+    }
+
+    @Override
+    public String sqlSegment(TableAvailable defaultTable) {
+        return "({0} IS NOT NULL AND {0} <> '' AND LTRIM({0}) <> '')";
+    }
+
+    @Override
+    public int paramMarks() {
+        return 1;
+    }
+
+    @Override
+    protected void consume0(SQLNativeChainExpressionContext context) {
+        context.expression(this.property);
+    }
+}
diff --git a/sql-core/src/main/java/com/easy/query/core/func/def/impl/NotEmptySQLFunction.java b/sql-core/src/main/java/com/easy/query/core/func/def/impl/NotEmptySQLFunction.java
@@ -0,0 +1,35 @@
+package com.easy.query.core.func.def.impl;
+
+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.def.AbstractSQLFunction;
+
+/**
+ * create time 2023/10/28 15:00
+ * 文件说明
+ *
+ * @author xuejiaming
+ */
+public class NotEmptySQLFunction extends AbstractSQLFunction {
+    private final String property;
+
+    public NotEmptySQLFunction(String property) {
+
+        this.property = property;
+    }
+
+    @Override
+    public String sqlSegment(TableAvailable defaultTable) {
+        return "({0} IS NOT NULL AND {0} <> '')";
+    }
+
+    @Override
+    public int paramMarks() {
+        return 1;
+    }
+
+    @Override
+    protected void consume0(SQLNativeChainExpressionContext context) {
+        context.expression(this.property);
+    }
+}
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>1.6.0</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>sql-db-support</artifactId>

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