1.1.16优化columnSubQueryAs和where的多表条件

dromara · Jul 6, 2023 · e3fe1ac · e3fe1ac
1 parent b97a05a
commit e3fe1ac
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 45 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.1.15</version>
+    <version>1.1.16</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.1.15</version>
+        <version>1.1.16</version>
     </parent>
 
     <artifactId>console-demo</artifactId>
@@ -29,14 +29,14 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <!-- 代理api -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api-proxy</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <!-- mysql驱动 -->

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.1.15</version>
+        <version>1.1.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

diff --git a/samples/springbootdemo/pom.xml b/samples/springbootdemo/pom.xml
@@ -70,19 +70,19 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-core</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api4j</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</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.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</version>
     </parent>
 
     <artifactId>sql-db-support</artifactId>

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

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.1.15</version>
+        <version>1.1.16</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.1.15</version>
+        <version>1.1.16</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.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</version>
     </parent>
 
     <artifactId>sql-extension</artifactId>

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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</version>
     </parent>
 
     <artifactId>sql-api-proxy</artifactId>

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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</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>1.1.15</version>
+        <version>1.1.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -41,19 +41,19 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-h2</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api4j</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api-proxy</artifactId>
-            <version>1.1.15</version>
+            <version>1.1.16</version>
             <scope>compile</scope>
         </dependency>
         <!-- mysql驱动 -->

diff --git a/sql-test/src/main/java/com/easy/query/test/QueryTest.java b/sql-test/src/main/java/com/easy/query/test/QueryTest.java
@@ -926,29 +926,35 @@ public void query45() {
                 .queryable(Topic.class).where(o -> o.exists(where.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toSQL();
         Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t WHERE EXISTS (SELECT 1 FROM `t_blog` t1 WHERE t1.`deleted` = ? AND t1.`id` = ? AND t1.`id` = t.`id`)", sql);
 
-        Queryable<BlogEntity> where1 = easyQuery.queryable(BlogEntity.class)
+        Queryable<BlogEntity> subQueryable = easyQuery.queryable(BlogEntity.class)
                 .where(o -> o.eq(BlogEntity::getId, "1"));
         List<Topic> x = easyQuery
-                .queryable(Topic.class).where(o -> o.exists(where1.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toList();
+                .queryable(Topic.class).where(o -> o.exists(subQueryable.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toList();
         Assert.assertEquals(1, x.size());
         Assert.assertEquals("1", x.get(0).getId());
     }
 
     @Test
     public void query46() {
-        Queryable<BlogEntity> where = easyQuery.queryable(BlogEntity.class)
-                .where(o -> o.eq(BlogEntity::getId, "123"));
-        String sql = easyQuery
-                .queryable(Topic.class).where(o -> o.notExists(where.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toSQL();
-        Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t WHERE NOT EXISTS (SELECT 1 FROM `t_blog` t1 WHERE t1.`deleted` = ? AND t1.`id` = ? AND t1.`id` = t.`id`)", sql);
+        {
 
-        Queryable<BlogEntity> where1 = easyQuery.queryable(BlogEntity.class)
-                .where(o -> o.eq(BlogEntity::getId, "1"));
-        List<Topic> x = easyQuery
-                .queryable(Topic.class).where(o -> o.notExists(where1.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toList();
-        Assert.assertEquals(100, x.size());
-        Assert.assertEquals("0", x.get(0).getId());
-        Assert.assertEquals("10", x.get(1).getId());
+            Queryable<BlogEntity> subQueryable = easyQuery.queryable(BlogEntity.class)
+                    .where(o -> o.eq(BlogEntity::getId, "123"));
+            String sql = easyQuery
+                    .queryable(Topic.class).where(o -> o.notExists(subQueryable.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toSQL();
+            Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t WHERE NOT EXISTS (SELECT 1 FROM `t_blog` t1 WHERE t1.`deleted` = ? AND t1.`id` = ? AND t1.`id` = t.`id`)", sql);
+
+        }
+        {
+
+            Queryable<BlogEntity> subQueryable = easyQuery.queryable(BlogEntity.class)
+                    .where(o -> o.eq(BlogEntity::getId, "1"));
+            List<Topic> x = easyQuery
+                    .queryable(Topic.class).where(o -> o.notExists(subQueryable.where(q -> q.eq(o, BlogEntity::getId, Topic::getId)))).toList();
+            Assert.assertEquals(100, x.size());
+            Assert.assertEquals("0", x.get(0).getId());
+            Assert.assertEquals("10", x.get(1).getId());
+        }
     }
 
     @Test