Merge branch 'save-250903'

Author: xuejmnet

sql-core/src/main/java/com/easy/query/core/annotation/Navigate.java

@@ -2,6 +2,7 @@
 
 import com.easy.query.core.basic.extension.navigate.DefaultNavigateExtraFilterStrategy;
 import com.easy.query.core.basic.extension.navigate.NavigateExtraFilterStrategy;
+import com.easy.query.core.enums.MappingClassSaveModeEnum;
 import com.easy.query.core.enums.PartitionOrderEnum;
 import com.easy.query.core.enums.RelationTypeEnum;
 
@@ -47,6 +48,12 @@
      */
     Class<?> mappingClass() default Object.class;
 
+    /**
+     * 仅多对多生效
+     * 中间表保存模式 默认报错需要用户指定，自动模式则认为中间表是简单表 手动模式则认为中间表是人为会去处理的
+     * @return
+     */
+    MappingClassSaveModeEnum mappingClassSaveMode() default MappingClassSaveModeEnum.THROW;
     /**
      * 多对多填写
      * 当前对象的{@param selfProperty}属性对应中间表的哪个属性,多对多不能为空
@@ -164,4 +171,6 @@
      */
     boolean ignoreAutoInclude() default false;
 
+
+
 }

sql-core/src/main/java/com/easy/query/core/annotation/UpdateIgnore.java

@@ -8,7 +8,7 @@
 
 /**
  * 更新对象时会自动忽略该列,任何时候都不会更新set这个
- * 除非你手动指定更新使用expression update,或者track update在追踪模式下update变更了
+ * 除非你手动指定更新使用expression update,或者track update在追踪模式下update变更了({@link #updateSetInTrackDiff()}为true才会在track下加入否则也不加入更新)
  *
  * @author xuejiaming
  */

sql-core/src/main/java/com/easy/query/core/api/client/DefaultEasyQueryClient.java

@@ -273,6 +273,16 @@ public <T> void loadInclude(List<T> entities, String navigateProperty, SQLAction
             IncludeProcessor includeProcess = includeProcessorFactory.createIncludeProcess(includeParserResult, runtimeContext);
             includeProcess.process();
         }
+        TrackManager trackManager = runtimeContext.getTrackManager();
+        TrackContext currentTrackContext = trackManager.getCurrentTrackContext();
+        if(currentTrackContext!=null){
+            for (T entity : entities) {
+                EntityState trackEntityState = currentTrackContext.getTrackEntityState(entity);
+                if(trackEntityState!=null){
+                    trackEntityState.addInclude(navigateMetadata);
+                }
+            }
+        }
     }
 
     @Override

sql-core/src/main/java/com/easy/query/core/basic/api/delete/ClientEntityDeletable.java

@@ -2,6 +2,9 @@
 
 import com.easy.query.core.basic.api.internal.ConfigureVersionable;
 import com.easy.query.core.basic.api.internal.SQLBatchExecute;
+import com.easy.query.core.basic.api.update.ClientEntityUpdatable;
+import com.easy.query.core.expression.lambda.SQLActionExpression1;
+import com.easy.query.core.expression.parser.core.base.ColumnOnlySelector;
 
 import java.util.List;
 
@@ -14,4 +17,20 @@
 public interface ClientEntityDeletable<T> extends Deletable<T, ClientEntityDeletable<T>>
         , ConfigureVersionable<ClientEntityDeletable<T>>, SQLBatchExecute<ClientEntityDeletable<T>> {
     List<T> getEntities();
+    /**
+     * 自定义条件当做where
+     * @param columnSelectorExpression
+     * @return
+     */
+    default ClientEntityDeletable<T> whereColumns(SQLActionExpression1<ColumnOnlySelector<T>> columnSelectorExpression) {
+        return whereColumns(true, columnSelectorExpression);
+    }
+
+    /**
+     * 自定义条件当做where
+     * @param condition
+     * @param columnSelectorExpression
+     * @return
+     */
+    ClientEntityDeletable<T> whereColumns(boolean condition, SQLActionExpression1<ColumnOnlySelector<T>> columnSelectorExpression);
 }

sql-core/src/main/java/com/easy/query/core/basic/api/delete/abstraction/AbstractClientEntityDeletable.java

@@ -11,7 +11,10 @@
 import com.easy.query.core.enums.ExecuteMethodEnum;
 import com.easy.query.core.enums.MultiTableTypeEnum;
 import com.easy.query.core.exception.EasyQueryException;
+import com.easy.query.core.expression.builder.impl.OnlySelectorImpl;
 import com.easy.query.core.expression.lambda.SQLActionExpression1;
+import com.easy.query.core.expression.parser.core.base.ColumnOnlySelector;
+import com.easy.query.core.expression.parser.core.base.impl.ColumnOnlySelectorImpl;
 import com.easy.query.core.expression.sql.builder.EntityDeleteExpressionBuilder;
 import com.easy.query.core.expression.sql.builder.EntityTableExpressionBuilder;
 import com.easy.query.core.expression.sql.builder.ExpressionContext;
@@ -61,6 +64,15 @@ public EntityDeleteExpressionBuilder getDeleteExpressionBuilder() {
         return entityDeleteExpressionBuilder;
     }
 
+    @Override
+    public ClientEntityDeletable<T> whereColumns(boolean condition, SQLActionExpression1<ColumnOnlySelector<T>> columnSelectorExpression) {
+        if (condition) {
+            ColumnOnlySelectorImpl<T> columnSelector = new ColumnOnlySelectorImpl<>(table.getEntityTable(), new OnlySelectorImpl(entityDeleteExpressionBuilder.getRuntimeContext(), entityDeleteExpressionBuilder.getExpressionContext(), entityDeleteExpressionBuilder.getWhereColumns()));
+            columnSelectorExpression.apply(columnSelector);
+        }
+        return this;
+    }
+
     @Override
     public long executeRows() {
 

sql-core/src/main/java/com/easy/query/core/basic/api/delete/impl/EasyEmptyClientEntityDeletable.java

@@ -1,9 +1,11 @@
 package com.easy.query.core.basic.api.delete.impl;
 
 import com.easy.query.core.basic.api.delete.ClientEntityDeletable;
+import com.easy.query.core.basic.api.update.ClientEntityUpdatable;
 import com.easy.query.core.basic.jdbc.parameter.ToSQLContext;
 import com.easy.query.core.exception.AssertExceptionFactory;
 import com.easy.query.core.expression.lambda.SQLActionExpression1;
+import com.easy.query.core.expression.parser.core.base.ColumnOnlySelector;
 import com.easy.query.core.expression.sql.builder.EntityDeleteExpressionBuilder;
 import com.easy.query.core.expression.sql.builder.ExpressionContext;
 import com.easy.query.core.expression.sql.builder.internal.ContextConfigurer;
@@ -32,6 +34,11 @@ public List<T> getEntities() {
         return EasyCollectionUtil.emptyList();
     }
 
+    @Override
+    public ClientEntityDeletable<T> whereColumns(boolean condition, SQLActionExpression1<ColumnOnlySelector<T>> columnSelectorExpression) {
+        return this;
+    }
+
     @Override
     public ExpressionContext getExpressionContext() {
         return null;

sql-core/src/main/java/com/easy/query/core/basic/api/save/Savable.java

@@ -0,0 +1,20 @@
+package com.easy.query.core.basic.api.save;
+
+import com.easy.query.core.basic.api.internal.SQLExecuteExpectRows;
+import com.easy.query.core.basic.api.internal.TableReNameable;
+import com.easy.query.core.expression.sql.builder.EntityDeleteExpressionBuilder;
+import com.easy.query.core.expression.sql.builder.ExpressionContext;
+
+/**
+ * create time 2025/9/3 11:22
+ * 文件说明
+ *
+ * @author xuejiaming
+ */
+public interface Savable {
+    /**
+     * 执行命令
+     * @return
+     */
+    void executeCommand();
+}

sql-core/src/main/java/com/easy/query/core/basic/api/select/abstraction/AbstractClientQueryable.java

@@ -457,17 +457,17 @@ public <TR> TR singleOrNull(@NotNull Class<TR> resultClass) {
             boolean printSQL = EasyJdbcExecutorUtil.isPrintSQL(jdbcStreamResult.getExecutorContext());
             Iterator<TR> iterator = streamResult.iterator();
 
-            int i = 0;
-            while (iterator.hasNext()) {
-                if (i >= 1) {
+            int total = 0;
+            if (iterator.hasNext()) {
+                next = iterator.next();
+                total = 1;
+                if (iterator.hasNext()) {
                     throw runtimeContext.getAssertExceptionFactory().createSingleMoreElementException(this);
                 }
-
-                next = iterator.next();
-                i++;
             }
+
             if (printSQL) {
-                log.info("<== Total: " + i);
+                log.info("<== Total: " + total);
             }
 
         } catch (SQLException e) {
@@ -537,10 +537,14 @@ public List<T1> toTreeList(boolean ignore) {
             }
             return list;
         }
-        List<TreeDeepItem> deepItems = this.expressionContext.getDeepItems();
         TreeCTEOption treeCTEOption = this.expressionContext.getTreeCTEOption();
-        TreeSelfTargetItem treeSelfTargetItem = getTreeSelfTargetItem(treeNavigateMetadata);
-        return EasyTreeUtil.generateTrees(list, entityMetadata, treeNavigateMetadata, treeSelfTargetItem, runtimeContext, treeCTEOption, deepItems);
+        if (treeCTEOption == null) {//非cte递归的情况下走原本的树组合
+            return EasyTreeUtil.generateTrees(list, entityMetadata, treeNavigateMetadata, runtimeContext);
+        } else {
+            List<TreeDeepItem> deepItems = this.expressionContext.getDeepItems();
+            TreeSelfTargetItem treeSelfTargetItem = getTreeSelfTargetItem(treeNavigateMetadata);
+            return EasyTreeUtil.generateTrees(list, entityMetadata, treeNavigateMetadata, treeSelfTargetItem, runtimeContext, treeCTEOption, deepItems);
+        }
     }
 
     private TreeSelfTargetItem getTreeSelfTargetItem(NavigateMetadata resultTreeNavigateMetadata) {
@@ -572,12 +576,12 @@ private TreeSelfTargetItem getTreeSelfTargetItem(NavigateMetadata resultTreeNavi
             }
         }
         String[] selfProperties = resultTreeNavigateMetadata.getSelfProperties();
-        if(EasyArrayUtil.isEmpty(selfProperties)){
-            throw new EasyQueryInvalidOperationException(EasyClassUtil.getSimpleName(this.entityMetadata.getEntityClass())+" is unable to access selfProperty during tree structure retrieval.");
+        if (EasyArrayUtil.isEmpty(selfProperties)) {
+            throw new EasyQueryInvalidOperationException(EasyClassUtil.getSimpleName(this.entityMetadata.getEntityClass()) + " is unable to access selfProperty during tree structure retrieval.");
         }
         String[] targetProperties = resultTreeNavigateMetadata.getTargetProperties();
-        if(EasyArrayUtil.isEmpty(targetProperties)){
-            throw new EasyQueryInvalidOperationException(EasyClassUtil.getSimpleName(this.entityMetadata.getEntityClass())+" is unable to access targetProperty during tree structure retrieval.");
+        if (EasyArrayUtil.isEmpty(targetProperties)) {
+            throw new EasyQueryInvalidOperationException(EasyClassUtil.getSimpleName(this.entityMetadata.getEntityClass()) + " is unable to access targetProperty during tree structure retrieval.");
         }
         return new TreeSelfTargetItem(selfProperties, targetProperties);
     }

sql-core/src/main/java/com/easy/query/core/basic/extension/track/DefaultTrackContext.java

@@ -58,6 +58,19 @@ public EntityState getTrackEntityState(Object entity) {
         return entityStateTrackMap.get(trackKey);
     }
 
+    @Override
+    public EntityState getTrackEntityState(Class<?> entityClass, String trackKey) {
+
+        if (trackKey == null) {
+            return null;
+        }
+        ConcurrentHashMap<String, EntityState> entityStateTrackMap = trackEntityMap.get(entityClass);
+        if (entityStateTrackMap == null || entityStateTrackMap.isEmpty()) {
+            return null;
+        }
+        return entityStateTrackMap.get(trackKey);
+    }
+
     @Override
     public boolean addTracking(@NotNull Object entity) {
         EntityState entityState = addInternalTracking(entity, false);
@@ -149,7 +162,8 @@ public boolean hasTracked(Class<?> entityClass) {
      * @param entityMetadata
      * @return
      */
-    private Object createAndCopyValue(Object entity, EntityMetadata entityMetadata) {
+    @Override
+    public Object createAndCopyValue(Object entity, EntityMetadata entityMetadata) {
 
 //        Class<?> entityClass = entity.getClass();
         Object original = entityMetadata.getBeanConstructorCreator().get();

sql-core/src/main/java/com/easy/query/core/basic/extension/track/EntityState.java

@@ -2,21 +2,31 @@
 
 import com.easy.query.core.metadata.ColumnMetadata;
 import com.easy.query.core.metadata.EntityMetadata;
-import com.easy.query.core.metadata.EntityMetadataManager;
+import com.easy.query.core.metadata.NavigateMetadata;
 import com.easy.query.core.util.EasyBeanUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
+ * @author xuejiaming
  * @FileName: EntryState.java
  * @Description: 文件说明
  * create time 2023/3/18 21:22
- * @author xuejiaming
  */
 public class EntityState {
     private final EntityMetadata entityMetadata;
     private final Object originalValue;
     private final Object currentValue;
     private final String trackKey;
 
+    private List<NavigateMetadata> includes;
+    private Map<NavigateMetadata, Set<String>> includeWithTrackKeyMap;
+
     public EntityState(EntityMetadata entityMetadata, String trackKey, Object originalValue, Object currentValue) {
         this.trackKey = trackKey;
         assert entityMetadata != null;
@@ -47,13 +57,59 @@ public Object getCurrentValue() {
         return currentValue;
     }
 
+    public List<NavigateMetadata> getIncludes() {
+        return includes;
+    }
+
+    public void setAppendIncludes(List<NavigateMetadata> includes) {
+        if (this.includes != null) {
+            if (includes != null) {
+                for (NavigateMetadata include : includes) {
+                    addInclude(include);
+                }
+            }
+        } else {
+            this.includes = includes;
+        }
+    }
+
+    public boolean addInclude(NavigateMetadata navigateMetadata) {
+        if (includes == null) {
+            includes = new ArrayList<>();
+        }
+        if (!includes.contains(navigateMetadata)) {
+            includes.add(navigateMetadata);
+            return true;
+        }
+        return false;
+    }
+
+    public void addTrackKey(NavigateMetadata navigateMetadata, String trackKey) {
+        if (includeWithTrackKeyMap == null) {
+            includeWithTrackKeyMap = new HashMap<>();
+        }
+        Set<String> trackKeys = includeWithTrackKeyMap.computeIfAbsent(navigateMetadata, o -> new LinkedHashSet<>());
+        if (trackKey != null) {
+            trackKeys.add(trackKey);
+        }
+    }
+
+    public Set<String> getTrackKeys(NavigateMetadata navigateMetadata) {
+        if (includeWithTrackKeyMap == null) {
+            return null;
+        }
+        return includeWithTrackKeyMap.get(navigateMetadata);
+    }
+
     public EntityValueState getEntityValueState(String propertyName) {
         ColumnMetadata columnMetadata = entityMetadata.getColumnNotNull(propertyName);
         return getEntityValueState(columnMetadata);
     }
+
     public EntityValueState getEntityValueState(ColumnMetadata columnMetadata) {
-        Object originalPropertyValue = EasyBeanUtil.getPropertyValue(originalValue,entityMetadata,columnMetadata);
-        Object currentPropertyValue = EasyBeanUtil.getPropertyValue(currentValue,entityMetadata,columnMetadata);
+        Object originalPropertyValue = EasyBeanUtil.getPropertyValue(originalValue, entityMetadata, columnMetadata);
+        Object currentPropertyValue = EasyBeanUtil.getPropertyValue(currentValue, entityMetadata, columnMetadata);
         return new EntityValueState(columnMetadata, originalPropertyValue, currentPropertyValue);
     }
+
 }