Skip to content

Commit 9a551f0

Browse files
xuejmnetxuejmnet
committed
refactor: 2.7.0
1 parent c3f8d95 commit 9a551f0

File tree

30 files changed

+27
-50
lines changed

30 files changed

+27
-50
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
99
<packaging>pom</packaging>
10-
<version>2.6.2</version>
10+
<version>2.7.0</version>
1111
<name>easy-query</name>
1212
<description>java object query distributed connector</description>
1313
<url>https://github.com/xuejmnet/easy-query</url>

‎sql-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>easy-query-all</artifactId>
77
<groupId>com.easy-query</groupId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎sql-db-support/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
</parent>
1111

1212
<artifactId>sql-db-support</artifactId>

‎sql-db-support/sql-clickhouse/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-dameng/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-db2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-gauss-db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-h2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-kingbase-es/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>sql-kingbase-es</artifactId>

‎sql-db-support/sql-mssql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-mysql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-oracle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-pgsql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-db-support/sql-sqlite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-extension/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
</parent>
1111

1212
<artifactId>sql-extension</artifactId>

‎sql-extension/sql-cache/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-extension/sql-kt-springboot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-extension/sql-solon-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-extension/sql-solon-plugin/src/main/java/com/easy/query/solon/integration/DbManager.java

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ private static EasyQueryHolder build(BeanWrap bw) {
174174
builder.setDefaultSchema(solonEasyQueryProperties.getDefaultSchema());
175175
builder.setResultSizeLimit(solonEasyQueryProperties.getResultSizeLimit());
176176
builder.setShardingQueryInTransaction(solonEasyQueryProperties.getShardingQueryInTransaction());
177-
builder.setRelationTableAppend(solonEasyQueryProperties.getRelationTableAppend());
178177
});
179178
DatabaseConfiguration databaseConfigure = getDatabaseConfigure(solonEasyQueryProperties);
180179
if (databaseConfigure != null) {

‎sql-extension/sql-solon-plugin/src/main/java/com/easy/query/solon/integration/SolonEasyQueryProperties.java

-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.easy.query.solon.integration;
22

33
import com.easy.query.core.enums.EntityMappingStrategyEnum;
4-
import com.easy.query.core.enums.RelationTableAppendEnum;
54
import com.easy.query.core.enums.SQLExecuteStrategyEnum;
65
import com.easy.query.core.enums.ShardingQueryInTransactionEnum;
76
import com.easy.query.core.enums.sharding.ConnectionModeEnum;
@@ -33,7 +32,6 @@ public class SolonEasyQueryProperties {
3332
private final static ConnectionModeEnum connectionMode = ConnectionModeEnum.SYSTEM_AUTO;
3433
private final static PropertyModeEnum propertyMode = PropertyModeEnum.FIRST_LOWER;
3534
private final static ShardingQueryInTransactionEnum shardingQueryInTransaction = ShardingQueryInTransactionEnum.SERIALIZABLE;
36-
private final static RelationTableAppendEnum relationTableAppend = RelationTableAppendEnum.SMART;
3735
private final static EntityMappingStrategyEnum mappingStrategy = EntityMappingStrategyEnum.COLUMN_ONLY;
3836
/**
3937
* 仅分片时有效默认同时5个线程5
@@ -284,15 +282,6 @@ public ShardingQueryInTransactionEnum getShardingQueryInTransaction() {
284282
return ShardingQueryInTransactionEnum.SERIALIZABLE;
285283
});
286284
}
287-
public RelationTableAppendEnum getRelationTableAppend() {
288-
return getOrDef("relation-table-append", relationTableAppend, v->{
289-
switch (v){
290-
case "default":return RelationTableAppendEnum.SMART;
291-
case "smart":return RelationTableAppendEnum.DEFAULT;
292-
}
293-
return RelationTableAppendEnum.SMART;
294-
});
295-
}
296285

297286
public int getMaxShardingQueryLimit() {
298287
return this.props.getInt("max-sharding-query-limit",maxShardingQueryLimit);

‎sql-extension/sql-springboot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-extension/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/EasyQueryStarterAutoConfiguration.java

-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ public EasyQueryClient easyQueryClient(DatabaseConfiguration databaseConfigurati
321321
builder.setDefaultSchema(easyQueryProperties.getDefaultSchema());
322322
builder.setResultSizeLimit(easyQueryProperties.getResultSizeLimit());
323323
builder.setShardingQueryInTransaction(easyQueryProperties.getShardingQueryInTransaction());
324-
builder.setRelationTableAppend(easyQueryProperties.getRelationTableAppend());
325324
})
326325
.useDatabaseConfigure(databaseConfiguration)
327326
.useStarterConfigure(starterConfigurer)

‎sql-extension/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/config/EasyQueryProperties.java

-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import com.easy.query.core.enums.EntityMappingStrategyEnum;
5-
import com.easy.query.core.enums.RelationTableAppendEnum;
65
import com.easy.query.core.enums.SQLExecuteStrategyEnum;
76
import com.easy.query.core.enums.ShardingQueryInTransactionEnum;
87
import com.easy.query.core.enums.sharding.ConnectionModeEnum;
@@ -35,7 +34,6 @@ public class EasyQueryProperties {
3534
private ConnectionModeEnum connectionMode = ConnectionModeEnum.SYSTEM_AUTO;
3635
private PropertyModeEnum propertyMode = PropertyModeEnum.FIRST_LOWER;
3736
private ShardingQueryInTransactionEnum shardingQueryInTransaction = ShardingQueryInTransactionEnum.SERIALIZABLE;
38-
private RelationTableAppendEnum relationTableAppend = RelationTableAppendEnum.SMART;
3937
/**
4038
* 仅分片时有效默认同时5个线程5
4139
*/
@@ -464,14 +462,6 @@ public void setShardingQueryInTransaction(ShardingQueryInTransactionEnum shardin
464462
this.shardingQueryInTransaction = shardingQueryInTransaction;
465463
}
466464

467-
public RelationTableAppendEnum getRelationTableAppend() {
468-
return relationTableAppend;
469-
}
470-
471-
public void setRelationTableAppend(RelationTableAppendEnum relationTableAppend) {
472-
this.relationTableAppend = relationTableAppend;
473-
}
474-
475465
public EntityMappingStrategyEnum getMappingStrategy() {
476466
return mappingStrategy;
477467
}

‎sql-ksp-processor/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
</parent>
1111

1212
<artifactId>sql-ksp-processor</artifactId>

‎sql-platform/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
</parent>
1111

1212
<artifactId>sql-platform</artifactId>

‎sql-platform/sql-api-proxy/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>sql-platform</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
</parent>
1111

1212
<artifactId>sql-api-proxy</artifactId>

‎sql-platform/sql-api4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-platform/sql-api4kt/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎sql-processor/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.easy-query</groupId>
88
<artifactId>easy-query-all</artifactId>
9-
<version>2.6.2</version>
9+
<version>2.7.0</version>
1010
</parent>
1111

1212
<artifactId>sql-processor</artifactId>

‎sql-test/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>easy-query-all</artifactId>
77
<groupId>com.easy-query</groupId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.easy-query</groupId>
9898
<artifactId>sql-api4kt</artifactId>
99-
<version>2.6.2</version>
99+
<version>2.7.0</version>
100100
<scope>compile</scope>
101101
</dependency>
102102
<dependency>

0 commit comments

Comments
 (0)