build: 3.1.2

xuejmnet · xuejmnet · commit 1625356dfe75 · 2025-09-09T23:32:52.000+08:00
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>3.1.1</version>
+    <version>3.1.2</version>
     <name>easy-query</name>
     <description>java object query distributed connector</description>
     <url>https://github.com/xuejmnet/easy-query</url>
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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
 
     <name>sql-db-support</name>
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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <name>sql-kingbase-es</name>
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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
 
     <name>sql-extension</name>
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>3.1.1</version>
+        <version>3.1.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sql-extension/sql-search/pom.xml b/sql-extension/sql-search/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
 
     <name>sql-ksp-processor</name>
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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
 
     <name>sql-platform</name>
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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
 
     <name>sql-api-proxy</name>
diff --git a/sql-platform/sql-api-proxy/src/main/java/com/easy/query/api/proxy/entity/save/provider/UpdateSaveProvider.java b/sql-platform/sql-api-proxy/src/main/java/com/easy/query/api/proxy/entity/save/provider/UpdateSaveProvider.java
@@ -92,10 +92,10 @@ private void createIncludePath(Class<?> entityClass, EntityMetadata entityMetada
 
     private void createNavigatePath(NavigateMetadata navigateMetadata, SavableContext savableContext, Set<String> trackKeys) {
 
-        EntityMetadata targetEntityMetadata=null;
-        if(navigateMetadata.getRelationType()==RelationTypeEnum.ManyToMany&&navigateMetadata.getMappingClass()!=null){
+        EntityMetadata targetEntityMetadata = null;
+        if (navigateMetadata.getRelationType() == RelationTypeEnum.ManyToMany && navigateMetadata.getMappingClass() != null) {
             targetEntityMetadata = entityMetadataManager.getEntityMetadata(navigateMetadata.getMappingClass());
-        }else{
+        } else {
             targetEntityMetadata = entityMetadataManager.getEntityMetadata(navigateMetadata.getNavigatePropertyType());
         }
         SaveNode saveNode = savableContext.putSaveNodeMap(navigateMetadata, targetEntityMetadata);
@@ -185,10 +185,7 @@ private void processEntity(Map<String, Object> dbEntityMap, Object selfEntity, O
 
 
         if (navigateMetadata.getRelationType() != RelationTypeEnum.ManyToMany) {
-            EntityState trackEntityState = currentTrackContext.getTrackEntityState(targetEntity);
-            if (trackEntityState != null) {
-                saveEntity(targetEntity, targetEntityMetadata, saveNode.getIndex() + 1);
-            }
+            saveEntity(targetEntity, targetEntityMetadata, saveNode.getIndex() + 1);
         }
 
     }
@@ -197,10 +194,10 @@ private void saveNodeDelete(Object selfEntity, Object targetEntity, EntityMetada
         if (navigateMetadata.getRelationType() == RelationTypeEnum.ManyToMany) {
             //检查中间表并且创建新增操作
             if (navigateMetadata.getMappingClass() == null) {
-                throw new EasyQueryInvalidOperationException("entity:["+EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass())+"]-["+EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType())+"] many to many relation must have mapping class");
+                throw new EasyQueryInvalidOperationException("entity:[" + EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass()) + "]-[" + EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType()) + "] many to many relation must have mapping class");
             }
             if (navigateMetadata.getMappingClassSaveMode() == MappingClassSaveModeEnum.THROW) {
-                throw new EasyQueryInvalidOperationException("entity:["+EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass())+"]-["+EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType())+"] many to many relation mapping class save mode is throw");
+                throw new EasyQueryInvalidOperationException("entity:[" + EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass()) + "]-[" + EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType()) + "] many to many relation mapping class save mode is throw");
             }
             //自动处理中间表
             if (navigateMetadata.getMappingClassSaveMode() == MappingClassSaveModeEnum.AUTO) {
@@ -218,10 +215,10 @@ private void saveNodeUpdate(EntityState trackEntityState, Object targetEntity, E
         if (navigateMetadata.getRelationType() == RelationTypeEnum.ManyToMany) {
             //检查中间表并且创建新增操作
             if (navigateMetadata.getMappingClass() == null) {
-                throw new EasyQueryInvalidOperationException("entity:["+EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass())+"]-["+EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType())+"] many to many relation must have mapping class");
+                throw new EasyQueryInvalidOperationException("entity:[" + EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass()) + "]-[" + EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType()) + "] many to many relation must have mapping class");
             }
             if (navigateMetadata.getMappingClassSaveMode() == MappingClassSaveModeEnum.THROW) {
-                throw new EasyQueryInvalidOperationException("entity:["+EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass())+"]-["+EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType())+"] many to many relation mapping class save mode is throw");
+                throw new EasyQueryInvalidOperationException("entity:[" + EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass()) + "]-[" + EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType()) + "] many to many relation mapping class save mode is throw");
             }
             //自动的简单中间表不需要更新
             return;
@@ -240,10 +237,10 @@ private void saveNodeInsert(Object selfEntity, Object targetEntity, EntityMetada
         if (navigateMetadata.getRelationType() == RelationTypeEnum.ManyToMany) {
             //检查中间表并且创建新增操作
             if (navigateMetadata.getMappingClass() == null) {
-                throw new EasyQueryInvalidOperationException("entity:["+EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass())+"]-["+EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType())+"] many to many relation must have mapping class");
+                throw new EasyQueryInvalidOperationException("entity:[" + EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass()) + "]-[" + EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType()) + "] many to many relation must have mapping class");
             }
             if (navigateMetadata.getMappingClassSaveMode() == MappingClassSaveModeEnum.THROW) {
-                throw new EasyQueryInvalidOperationException("entity:["+EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass())+"]-["+EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType())+"] many to many relation mapping class save mode is throw");
+                throw new EasyQueryInvalidOperationException("entity:[" + EasyClassUtil.getSimpleName(navigateMetadata.getEntityMetadata().getEntityClass()) + "]-[" + EasyClassUtil.getSimpleName(navigateMetadata.getNavigatePropertyType()) + "] many to many relation mapping class save mode is throw");
             }
             //自动处理中间表
             if (navigateMetadata.getMappingClassSaveMode() == MappingClassSaveModeEnum.AUTO) {
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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
 
     <name>sql-processor</name>
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>3.1.1</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sql-test/src/main/java/com/easy/query/test/mysql8/BaseTest.java b/sql-test/src/main/java/com/easy/query/test/mysql8/BaseTest.java
@@ -41,6 +41,7 @@
 import com.easy.query.test.mysql8.entity.save.M8SaveRoot;
 import com.easy.query.test.mysql8.entity.save.M8SaveRoot2Many;
 import com.easy.query.test.mysql8.entity.save.M8SaveRootMany;
+import com.easy.query.test.mysql8.entity.save.M8SaveRootManyOne;
 import com.easy.query.test.mysql8.entity.save.M8SaveRootMiddleMany;
 import com.easy.query.test.mysql8.entity.save.M8SaveRootOne;
 import com.easy.query.test.mysql8.entity.save.SaveInterceptor;
@@ -127,11 +128,11 @@ public static void beforex() {
 //        CodeFirstCommand codeFirstCommand = databaseCodeFirst.syncTableCommand(Arrays.asList(SysUser.class,SysBank.class, SysBankCard.class,  SysUserBook.class, M8Comment.class));
 //        codeFirstCommand.executeWithTransaction(s -> s.commit());
         CodeFirstCommand codeFirstCommand2 = databaseCodeFirst.dropTableIfExistsCommand(Arrays.asList(SysUser.class, SysBankCard.class, SysBank.class, SysUserBook.class, M8Comment.class, M8Parent.class, M8Child.class, M8ParentChild.class,
-                M8Province.class, M8City.class, M8Area.class, M8AreaBuild.class, TreeA.class, TreeB.class, BatchInsert.class, Comment.class, M8SaveRoot.class, M8SaveRoot2Many.class, M8SaveRootMany.class, M8SaveRootMiddleMany.class, M8SaveRootOne.class));
+                M8Province.class, M8City.class, M8Area.class, M8AreaBuild.class, TreeA.class, TreeB.class, BatchInsert.class, Comment.class, M8SaveRoot.class, M8SaveRoot2Many.class, M8SaveRootMany.class, M8SaveRootMiddleMany.class, M8SaveRootOne.class, M8SaveRootManyOne.class));
         codeFirstCommand2.executeWithTransaction(s -> s.commit());
 
         CodeFirstCommand codeFirstCommand1 = databaseCodeFirst.syncTableCommand(Arrays.asList(SysUser.class, SysBank.class, SysBankCard.class, SysUserBook.class, M8Comment.class, M8Parent.class, M8Child.class, M8ParentChild.class,
-                M8Province.class, M8City.class, M8Area.class, M8AreaBuild.class,M8AreaBuildLicense.class, TreeA.class, TreeB.class, BatchInsert.class,Comment.class, M8SaveRoot.class, M8SaveRoot2Many.class, M8SaveRootMany.class, M8SaveRootMiddleMany.class, M8SaveRootOne.class));
+                M8Province.class, M8City.class, M8Area.class, M8AreaBuild.class,M8AreaBuildLicense.class, TreeA.class, TreeB.class, BatchInsert.class,Comment.class, M8SaveRoot.class, M8SaveRoot2Many.class, M8SaveRootMany.class, M8SaveRootMiddleMany.class, M8SaveRootOne.class,M8SaveRootManyOne.class));
         codeFirstCommand1.executeWithTransaction(s -> {
             System.out.println(s.getSQL());
             s.commit();
diff --git a/sql-test/src/main/java/com/easy/query/test/mysql8/M8SaveTest.java b/sql-test/src/main/java/com/easy/query/test/mysql8/M8SaveTest.java
diff --git a/sql-test/src/main/java/com/easy/query/test/mysql8/entity/save/M8SaveRootMany.java b/sql-test/src/main/java/com/easy/query/test/mysql8/entity/save/M8SaveRootMany.java
diff --git a/sql-test/src/main/java/com/easy/query/test/mysql8/entity/save/M8SaveRootManyOne.java b/sql-test/src/main/java/com/easy/query/test/mysql8/entity/save/M8SaveRootManyOne.java
diff --git a/sql-test/src/main/java/com/easy/query/test/mysql8/entity/save/SaveInterceptor.java b/sql-test/src/main/java/com/easy/query/test/mysql8/entity/save/SaveInterceptor.java
