diff --git a/pom.xml b/pom.xml index 70137126d..77720808c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.easy-query easy-query-all pom - 1.7.10 + 1.7.11 easy-query java object query distributed connector https://github.com/xuejmnet/easy-query diff --git a/samples/console-demo/pom.xml b/samples/console-demo/pom.xml index 1236820e7..657455fb4 100644 --- a/samples/console-demo/pom.xml +++ b/samples/console-demo/pom.xml @@ -6,7 +6,7 @@ com.easy-query samples - 1.7.10 + 1.7.11 console-demo @@ -22,21 +22,21 @@ com.easy-query sql-mysql - 1.7.10 + 1.7.11 compile com.easy-query sql-processor - 1.7.10 + 1.7.11 compile com.easy-query sql-api-proxy - 1.7.10 + 1.7.11 compile diff --git a/samples/easy-query-solon-web/pom.xml b/samples/easy-query-solon-web/pom.xml index d545e8fbd..6d8a2b954 100644 --- a/samples/easy-query-solon-web/pom.xml +++ b/samples/easy-query-solon-web/pom.xml @@ -6,7 +6,7 @@ com.easy-query samples - 1.7.10 + 1.7.11 com.easy.query.solon @@ -22,13 +22,13 @@ com.easy-query sql-solon-plugin - 1.7.10 + 1.7.11 compile com.easy-query sql-processor - 1.7.10 + 1.7.11 compile diff --git a/samples/pom.xml b/samples/pom.xml index b26bd1eee..6e5b995b1 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ easy-query-all com.easy-query - 1.7.10 + 1.7.11 4.0.0 @@ -43,7 +43,7 @@ com.easy-query sql-springboot-starter - 1.7.10 + 1.7.11 compile diff --git a/samples/solon-sharding-demo/pom.xml b/samples/solon-sharding-demo/pom.xml index e2e4733a0..27110fec5 100644 --- a/samples/solon-sharding-demo/pom.xml +++ b/samples/solon-sharding-demo/pom.xml @@ -6,7 +6,7 @@ com.easy-query samples - 1.7.10 + 1.7.11 com.easy.query @@ -22,7 +22,7 @@ com.easy-query sql-solon-plugin - 1.7.10 + 1.7.11 compile diff --git a/samples/spring-sharding-demo/pom.xml b/samples/spring-sharding-demo/pom.xml index 696fa9922..259d054f5 100644 --- a/samples/spring-sharding-demo/pom.xml +++ b/samples/spring-sharding-demo/pom.xml @@ -55,13 +55,13 @@ com.easy-query sql-processor - 1.7.10 + 1.7.11 compile com.easy-query sql-springboot-starter - 1.7.10 + 1.7.11 compile diff --git a/samples/springbootdemo/pom.xml b/samples/springbootdemo/pom.xml index 8b4b31750..ca522fc0e 100644 --- a/samples/springbootdemo/pom.xml +++ b/samples/springbootdemo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.2 + 2.7.17 org.easy-query @@ -58,7 +58,7 @@ mysql mysql-connector-java - 8.0.28 + 8.0.31 @@ -74,19 +74,19 @@ com.easy-query sql-core - 1.7.10 + 1.7.11 compile com.easy-query sql-api4j - 1.7.10 + 1.7.11 compile com.easy-query sql-springboot-starter - 1.7.10 + 1.7.11 compile diff --git a/sql-core/pom.xml b/sql-core/pom.xml index 404f6b731..c6e2ca518 100644 --- a/sql-core/pom.xml +++ b/sql-core/pom.xml @@ -5,7 +5,7 @@ easy-query-all com.easy-query - 1.7.10 + 1.7.11 4.0.0 diff --git a/sql-core/src/main/java/com/easy/query/core/api/def/DefaultSQLClientApiFactory.java b/sql-core/src/main/java/com/easy/query/core/api/def/DefaultSQLClientApiFactory.java index 5c16084b3..71b2de098 100644 --- a/sql-core/src/main/java/com/easy/query/core/api/def/DefaultSQLClientApiFactory.java +++ b/sql-core/src/main/java/com/easy/query/core/api/def/DefaultSQLClientApiFactory.java @@ -317,7 +317,7 @@ public ClientQueryable4 createQueryable4(Class< @Override public ClientQueryable5 createQueryable5(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t5Class); ExpressionContext queryExpressionContext = entityQueryExpressionBuilder.getExpressionContext(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, queryExpressionContext.getRuntimeContext()); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -330,7 +330,7 @@ public ClientQueryable5 createQueryable Class t5Class = joinQueryable.queryClass(); - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t5Class); EntityQueryExpressionBuilder joinQueryableSQLEntityExpressionBuilder = joinQueryable.getSQLEntityExpressionBuilder(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createAnonymousEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, joinQueryableSQLEntityExpressionBuilder); @@ -342,7 +342,7 @@ public ClientQueryable5 createQueryable @Override public ClientQueryable6 createQueryable6(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t6Class); ExpressionContext queryExpressionContext = entityQueryExpressionBuilder.getExpressionContext(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, queryExpressionContext.getRuntimeContext()); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -354,7 +354,7 @@ public ClientQueryable6 createQ public ClientQueryable6 createQueryable6(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, ClientQueryable joinQueryable, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { Class t6Class = joinQueryable.queryClass(); - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t6Class); EntityQueryExpressionBuilder joinQueryableSQLEntityExpressionBuilder = joinQueryable.getSQLEntityExpressionBuilder(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createAnonymousEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, joinQueryableSQLEntityExpressionBuilder); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -364,7 +364,7 @@ public ClientQueryable6 createQ @Override public ClientQueryable7 createQueryable7(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t7Class); ExpressionContext queryExpressionContext = entityQueryExpressionBuilder.getExpressionContext(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, queryExpressionContext.getRuntimeContext()); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -377,7 +377,7 @@ public ClientQueryable7 public ClientQueryable7 createQueryable7(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, ClientQueryable joinQueryable, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { Class t7Class = joinQueryable.queryClass(); - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t7Class); EntityQueryExpressionBuilder joinQueryableSQLEntityExpressionBuilder = joinQueryable.getSQLEntityExpressionBuilder(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createAnonymousEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, joinQueryableSQLEntityExpressionBuilder); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -388,7 +388,7 @@ public ClientQueryable7 @Override public ClientQueryable8 createQueryable8(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, Class t8Class, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t8Class); ExpressionContext queryExpressionContext = entityQueryExpressionBuilder.getExpressionContext(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, queryExpressionContext.getRuntimeContext()); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -399,7 +399,7 @@ public ClientQueryable8 ClientQueryable8 createQueryable8(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, ClientQueryable joinQueryable, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { Class t8Class = joinQueryable.queryClass(); - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t8Class); EntityQueryExpressionBuilder joinQueryableSQLEntityExpressionBuilder = joinQueryable.getSQLEntityExpressionBuilder(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createAnonymousEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, joinQueryableSQLEntityExpressionBuilder); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -410,7 +410,7 @@ public ClientQueryable8 ClientQueryable9 createQueryable9(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, Class t8Class, Class t9Class, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t9Class); ExpressionContext queryExpressionContext = entityQueryExpressionBuilder.getExpressionContext(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, queryExpressionContext.getRuntimeContext()); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -421,7 +421,7 @@ public ClientQueryable9 ClientQueryable9 createQueryable9(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, Class t8Class, ClientQueryable joinQueryable, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { Class t9Class = joinQueryable.queryClass(); - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t9Class); EntityQueryExpressionBuilder joinQueryableSQLEntityExpressionBuilder = joinQueryable.getSQLEntityExpressionBuilder(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createAnonymousEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, joinQueryableSQLEntityExpressionBuilder); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -432,7 +432,7 @@ public ClientQueryable9 ClientQueryable10 createQueryable10(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, Class t8Class, Class t9Class, Class t10Class, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t10Class); ExpressionContext queryExpressionContext = entityQueryExpressionBuilder.getExpressionContext(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, queryExpressionContext.getRuntimeContext()); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); @@ -443,7 +443,7 @@ public ClientQueryable10 ClientQueryable10 createQueryable10(Class t1Class, Class t2Class, Class t3Class, Class t4Class, Class t5Class, Class t6Class, Class t7Class, Class t8Class, Class t9Class, ClientQueryable joinQueryable, MultiTableTypeEnum selectTableInfoType, EntityQueryExpressionBuilder entityQueryExpressionBuilder) { Class t10Class = joinQueryable.queryClass(); - EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t4Class); + EntityMetadata entityMetadata = entityQueryExpressionBuilder.getRuntimeContext().getEntityMetadataManager().getEntityMetadata(t10Class); EntityQueryExpressionBuilder joinQueryableSQLEntityExpressionBuilder = joinQueryable.getSQLEntityExpressionBuilder(); EntityTableExpressionBuilder sqlTable = expressionBuilderFactory.createAnonymousEntityTableExpressionBuilder(entityMetadata, selectTableInfoType, joinQueryableSQLEntityExpressionBuilder); entityQueryExpressionBuilder.addSQLEntityTableExpression(sqlTable); diff --git a/sql-db-support/pom.xml b/sql-db-support/pom.xml index 2cf361c09..41ea42922 100644 --- a/sql-db-support/pom.xml +++ b/sql-db-support/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 sql-db-support diff --git a/sql-db-support/sql-dameng/pom.xml b/sql-db-support/sql-dameng/pom.xml index 80e6016ef..0480b73b4 100644 --- a/sql-db-support/sql-dameng/pom.xml +++ b/sql-db-support/sql-dameng/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-db-support/sql-h2/pom.xml b/sql-db-support/sql-h2/pom.xml index 6ca583906..26c9715bb 100644 --- a/sql-db-support/sql-h2/pom.xml +++ b/sql-db-support/sql-h2/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-db-support/sql-kingbase-es/pom.xml b/sql-db-support/sql-kingbase-es/pom.xml index ab47c80bd..10fa7c8c1 100644 --- a/sql-db-support/sql-kingbase-es/pom.xml +++ b/sql-db-support/sql-kingbase-es/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml sql-kingbase-es diff --git a/sql-db-support/sql-mssql/pom.xml b/sql-db-support/sql-mssql/pom.xml index 458df1785..b806c572e 100644 --- a/sql-db-support/sql-mssql/pom.xml +++ b/sql-db-support/sql-mssql/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-db-support/sql-mysql/pom.xml b/sql-db-support/sql-mysql/pom.xml index be839910a..99e5a5448 100644 --- a/sql-db-support/sql-mysql/pom.xml +++ b/sql-db-support/sql-mysql/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-db-support/sql-oracle/pom.xml b/sql-db-support/sql-oracle/pom.xml index 49d36e68b..d3c163e90 100644 --- a/sql-db-support/sql-oracle/pom.xml +++ b/sql-db-support/sql-oracle/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-db-support/sql-pgsql/pom.xml b/sql-db-support/sql-pgsql/pom.xml index 61a788f5d..631e42f73 100644 --- a/sql-db-support/sql-pgsql/pom.xml +++ b/sql-db-support/sql-pgsql/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-db-support/sql-sqlite/pom.xml b/sql-db-support/sql-sqlite/pom.xml index 085e7e90e..f85be73fb 100644 --- a/sql-db-support/sql-sqlite/pom.xml +++ b/sql-db-support/sql-sqlite/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-extension/pom.xml b/sql-extension/pom.xml index 0bb41bc41..ef4f0f4fb 100644 --- a/sql-extension/pom.xml +++ b/sql-extension/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 sql-extension diff --git a/sql-extension/sql-kt-springboot-starter/pom.xml b/sql-extension/sql-kt-springboot-starter/pom.xml index c76c2cff3..90b187a0b 100644 --- a/sql-extension/sql-kt-springboot-starter/pom.xml +++ b/sql-extension/sql-kt-springboot-starter/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-extension/sql-solon-plugin/pom.xml b/sql-extension/sql-solon-plugin/pom.xml index 03c103097..1d2da8c80 100644 --- a/sql-extension/sql-solon-plugin/pom.xml +++ b/sql-extension/sql-solon-plugin/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-extension/sql-springboot-starter/pom.xml b/sql-extension/sql-springboot-starter/pom.xml index b32eb834b..bfa538d1b 100644 --- a/sql-extension/sql-springboot-starter/pom.xml +++ b/sql-extension/sql-springboot-starter/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-platform/pom.xml b/sql-platform/pom.xml index 992ecf9b7..752e1dd83 100644 --- a/sql-platform/pom.xml +++ b/sql-platform/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 sql-platform diff --git a/sql-platform/sql-api-proxy/pom.xml b/sql-platform/sql-api-proxy/pom.xml index a9609d60b..93b94668c 100644 --- a/sql-platform/sql-api-proxy/pom.xml +++ b/sql-platform/sql-api-proxy/pom.xml @@ -6,7 +6,7 @@ com.easy-query sql-platform - 1.7.10 + 1.7.11 sql-api-proxy diff --git a/sql-platform/sql-api4j/pom.xml b/sql-platform/sql-api4j/pom.xml index 8e2cbbb7f..7f8e280c0 100644 --- a/sql-platform/sql-api4j/pom.xml +++ b/sql-platform/sql-api4j/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-platform/sql-api4kt/pom.xml b/sql-platform/sql-api4kt/pom.xml index cc6d3ea07..e23dcc4d2 100644 --- a/sql-platform/sql-api4kt/pom.xml +++ b/sql-platform/sql-api4kt/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 ../../pom.xml diff --git a/sql-processor/pom.xml b/sql-processor/pom.xml index 403994512..3df8af418 100644 --- a/sql-processor/pom.xml +++ b/sql-processor/pom.xml @@ -6,7 +6,7 @@ com.easy-query easy-query-all - 1.7.10 + 1.7.11 sql-processor diff --git a/sql-test/pom.xml b/sql-test/pom.xml index 3429830e2..2dd46984b 100644 --- a/sql-test/pom.xml +++ b/sql-test/pom.xml @@ -5,7 +5,7 @@ easy-query-all com.easy-query - 1.7.10 + 1.7.11 4.0.0 @@ -71,7 +71,7 @@ com.easy-query sql-api4kt - 1.7.10 + 1.7.11 compile diff --git a/sql-test/src/main/java/com/easy/query/test/QueryTest8.java b/sql-test/src/main/java/com/easy/query/test/QueryTest8.java index 5247bde35..132707719 100644 --- a/sql-test/src/main/java/com/easy/query/test/QueryTest8.java +++ b/sql-test/src/main/java/com/easy/query/test/QueryTest8.java @@ -854,6 +854,34 @@ public void test112(){ } } +// @Test +// public void test113(){ +// +// { +// +// +// Supplier f = () -> { +// try { +// TopicProxy table = TopicProxy.createTable(); +// EasyPageResult pageResult = easyProxyQuery.queryable(table) +// .where(o -> o.eq(table.id(), "1")) +// .select(TopicProxy.createTable(), o -> o.columns(table.id(), table.stars())).distinct() +// .toPageResult(1, 10); +// }catch (Exception ex){ +// return ex; +// } +// return null; +// }; +// Exception exception = f.get(); +// Assert.assertNotNull(exception); +// Assert.assertTrue(exception instanceof EasyQuerySQLCommandException); +// EasyQuerySQLCommandException easyQuerySQLCommandException = (EasyQuerySQLCommandException) exception; +// Assert.assertTrue(easyQuerySQLCommandException.getCause() instanceof EasyQuerySQLStatementException); +// EasyQuerySQLStatementException easyQuerySQLStatementException = (EasyQuerySQLStatementException) easyQuerySQLCommandException.getCause(); +// Assert.assertEquals("SELECT COUNT(DISTINCT t.`id`,t.`stars`) FROM `AAA` t WHERE t.`id` = ?",easyQuerySQLStatementException.getSQL()); +// +// } +// } @@ -878,4 +906,99 @@ public void query40() { Assert.assertEquals("SELECT DISTINCT t1.`publish_time`,t1.`id`,t1.`score` FROM `t_topic` t INNER JOIN `t_blog` t1 ON t1.`deleted` = ? AND t.`id` = t1.`id` WHERE t1.`title` IS NOT NULL ORDER BY t1.`publish_time` DESC LIMIT 20", s1); } + + @Test + public void testJoin5(){ + String sql = easyQuery.queryable(Topic.class) + .leftJoin(Topic.class, (t1, t2) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(BlogEntity.class, (t1, t2, t3, t4, t5) -> t1.eq(t2, Topic::getId, Topic::getId)) + .where((t1, t2, t3, t4, t5) -> { + t1.eq(Topic::getStars, 1); + t5.eq(BlogEntity::getOrder, "1"); + }).toSQL(); + Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t LEFT JOIN `t_topic` t1 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t2 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t3 ON t.`id` = t1.`id` LEFT JOIN `t_blog` t4 ON t4.`deleted` = ? AND t.`id` = t1.`id` WHERE t.`stars` = ? AND t4.`order` = ?",sql); + } + @Test + public void testJoin6(){ + String sql = easyQuery.queryable(Topic.class) + .leftJoin(Topic.class, (t1, t2) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(BlogEntity.class, (t1, t2, t3, t4, t5,t6) -> t1.eq(t2, Topic::getId, Topic::getId)) + .where((t1, t2, t3, t4, t5,t6) -> { + t1.eq(Topic::getStars, 1); + t6.eq(BlogEntity::getOrder, "1"); + }).toSQL(); + Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t LEFT JOIN `t_topic` t1 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t2 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t3 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t4 ON t.`id` = t1.`id` LEFT JOIN `t_blog` t5 ON t5.`deleted` = ? AND t.`id` = t1.`id` WHERE t.`stars` = ? AND t5.`order` = ?",sql); + } + @Test + public void testJoin7(){ + String sql = easyQuery.queryable(Topic.class) + .leftJoin(Topic.class, (t1, t2) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(BlogEntity.class, (t1, t2, t3, t4, t5,t6,t7) -> t1.eq(t2, Topic::getId, Topic::getId)) + .where((t1, t2, t3, t4, t5,t6,t7) -> { + t1.eq(Topic::getStars, 1); + t7.eq(BlogEntity::getOrder, "1"); + }).toSQL(); + Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t LEFT JOIN `t_topic` t1 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t2 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t3 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t4 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t5 ON t.`id` = t1.`id` LEFT JOIN `t_blog` t6 ON t6.`deleted` = ? AND t.`id` = t1.`id` WHERE t.`stars` = ? AND t6.`order` = ?",sql); + } + @Test + public void testJoin8(){ + String sql = easyQuery.queryable(Topic.class) + .leftJoin(Topic.class, (t1, t2) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6,t7) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(BlogEntity.class, (t1, t2, t3, t4, t5,t6,t7,t8) -> t1.eq(t2, Topic::getId, Topic::getId)) + .where((t1, t2, t3, t4, t5,t6,t7,t8) -> { + t1.eq(Topic::getStars, 1); + t8.eq(BlogEntity::getOrder, "1"); + }).toSQL(); + Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t LEFT JOIN `t_topic` t1 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t2 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t3 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t4 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t5 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t6 ON t.`id` = t1.`id` LEFT JOIN `t_blog` t7 ON t7.`deleted` = ? AND t.`id` = t1.`id` WHERE t.`stars` = ? AND t7.`order` = ?",sql); + } + @Test + public void testJoin9(){ + String sql = easyQuery.queryable(Topic.class) + .leftJoin(Topic.class, (t1, t2) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6,t7) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6,t7,t8) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(BlogEntity.class, (t1, t2, t3, t4, t5,t6,t7,t8,t9) -> t1.eq(t2, Topic::getId, Topic::getId)) + .where((t1, t2, t3, t4, t5,t6,t7,t8,t9) -> { + t1.eq(Topic::getStars, 1); + t9.eq(BlogEntity::getOrder, "1"); + }).toSQL(); + Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t LEFT JOIN `t_topic` t1 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t2 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t3 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t4 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t5 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t6 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t7 ON t.`id` = t1.`id` LEFT JOIN `t_blog` t8 ON t8.`deleted` = ? AND t.`id` = t1.`id` WHERE t.`stars` = ? AND t8.`order` = ?",sql); + } + @Test + public void testJoin10(){ + String sql = easyQuery.queryable(Topic.class) + .leftJoin(Topic.class, (t1, t2) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6,t7) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6,t7,t8) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(Topic.class, (t1, t2, t3, t4, t5,t6,t7,t8,t9) -> t1.eq(t2, Topic::getId, Topic::getId)) + .leftJoin(BlogEntity.class, (t1, t2, t3, t4, t5,t6,t7,t8,t9,t10) -> t1.eq(t2, Topic::getId, Topic::getId)) + .where((t1, t2, t3, t4, t5,t6,t7,t8,t9,t10) -> { + t1.eq(Topic::getStars, 1); + t10.eq(BlogEntity::getOrder, "1"); + }).toSQL(); + Assert.assertEquals("SELECT t.`id`,t.`stars`,t.`title`,t.`create_time` FROM `t_topic` t LEFT JOIN `t_topic` t1 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t2 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t3 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t4 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t5 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t6 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t7 ON t.`id` = t1.`id` LEFT JOIN `t_topic` t8 ON t.`id` = t1.`id` LEFT JOIN `t_blog` t9 ON t9.`deleted` = ? AND t.`id` = t1.`id` WHERE t.`stars` = ? AND t9.`order` = ?",sql); + } + }