#945

Author: babyfish-ct

project/jimmer-sql-kotlin/src/main/kotlin/org/babyfish/jimmer/sql/kt/KSqlClient.kt

@@ -17,9 +17,11 @@ import org.babyfish.jimmer.sql.kt.cfg.KSqlClientDsl
 import org.babyfish.jimmer.sql.kt.filter.KFilterDsl
 import org.babyfish.jimmer.sql.kt.filter.KFilters
 import org.babyfish.jimmer.sql.kt.impl.KSqlClientImpl
+import org.babyfish.jimmer.sql.runtime.ConnectionManager
 import org.babyfish.jimmer.sql.runtime.EntityManager
 import org.babyfish.jimmer.sql.runtime.Executor
 import org.babyfish.jimmer.sql.runtime.JSqlClientImplementor
+import org.babyfish.jimmer.sql.transaction.AbstractTxConnectionManager
 import org.babyfish.jimmer.sql.transaction.Propagation
 import java.sql.Connection
 import kotlin.reflect.KClass
@@ -79,27 +81,18 @@ interface KSqlClient : KSaver {
     val triggers: KTriggers
 
     /**
-     * <ul>
-     *     <li>
-     *         If trigger type is 'BINLOG_ONLY'
-     *         <ul>
-     *             <li>If `transaction` is true, throws exception</li>
-     *             <li>If `transaction` is false, return binlog trigger</li>
-     *         </ul>
-     *     </li>
-     *     <li>
-     *         If trigger type is 'TRANSACTION_ONLY', returns transaction trigger
-     *         no matter what the `transaction` is
-     *     </li>
-     *     <li>
-     *         If trigger type is 'BOTH'
-     *         <ul>
-     *             <li>If `transaction` is true, return transaction trigger</li>
-     *             <li>If `transaction` is false, return binlog trigger</li>
-     *         </ul>
-     *         Note that the objects returned by different parameters are independent of each other.
-     *     </li>
-     * </ul>
+     * -   If trigger type is 'BINLOG_ONLY'
+     *     -   If `transaction` is true, throws exception
+     *     -   If `transaction` is false, return binlog trigger
+     *
+     * -   If trigger type is 'TRANSACTION_ONLY',
+     * returns transaction trigger no matter what the `transaction` is
+     *
+     * -   If trigger type is 'BOTH'
+     *     -   If `transaction` is true, return transaction trigger
+     *     -   If `transaction` is false, return binlog trigger
+     *     >   Note that the objects returned by different parameters are independent of each other.
+     *
      * @param transaction
      * @return Trigger
      */
@@ -253,6 +246,25 @@ interface KSqlClient : KSaver {
     fun <E : Any> deleteByIds(type: KClass<E>, ids: Iterable<*>, block: KDeleteCommandDsl.() -> Unit): KDeleteResult =
         entities.deleteAll(type, ids, block = block)
 
+    /**
+     * Execute a transaction by the specified [Propagation] behavior
+     *
+     * -   If an IOC framework is used, its implementation
+     * should be an encapsulation of the transaction management
+     * within the IOC framework. Taking `jimmer-spring-starter`
+     * as an example, it is the `SpringConnectionManager`
+     * which will be created and enabled automatically.
+     *
+     * -   If no IOC framework is used, the class
+     * [AbstractTxConnectionManager] is the
+     * lightweight implementation provided by jimmer,
+     * please specify the connection manager of sqlClient
+     * by [ConnectionManager.simpleConnectionManager]
+     *
+     * @param propagation The propagation behavior
+     * @param block The action to be executed in transaction
+     * @return The result of transaction
+     */
     fun <R> transaction(propagation: Propagation = Propagation.REQUIRED, block: () -> R): R
 
     val javaClient: JSqlClientImplementor

project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/JSqlClient.java

@@ -27,10 +27,12 @@
 import org.babyfish.jimmer.sql.meta.IdGenerator;
 import org.babyfish.jimmer.sql.meta.MetaStringResolver;
 import org.babyfish.jimmer.sql.runtime.*;
+import org.babyfish.jimmer.sql.transaction.AbstractTxConnectionManager;
 import org.babyfish.jimmer.sql.transaction.Propagation;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.sql.DataSource;
 import java.time.ZoneId;
 import java.util.Collection;
 import java.util.List;
@@ -193,10 +195,52 @@ default DeleteResult deleteByIds(Class<?> type, Iterable<?> ids) {
         return getEntities().deleteAll(type, ids, DeleteMode.AUTO);
     }
 
+    /**
+     * Execute a transaction by the default propagation behavior
+     * {@link Propagation#REQUIRED}
+     *
+     * <ul>
+     *     <li>If an IOC framework is used, its implementation
+     *     should be an encapsulation of the transaction management
+     *     within the IOC framework. Taking {@code jimmer-spring-starter}
+     *     as an example, it is the {@code SpringConnectionManager}
+     *     which will be created and enabled automatically.</li>
+     *
+     *     <li>If no IOC framework is used, the class
+     *     {@link AbstractTxConnectionManager} is the
+     *     lightweight implementation provided by jimmer,
+     *     please specify the connection manager of sqlClient by
+     *     {@link ConnectionManager#simpleConnectionManager(DataSource)}</li>
+     * </ul>
+     *
+     * @param block The action to be executed in transaction
+     * @return The result of transaction
+     */
     default <R> R transaction(Supplier<R> block) {
         return transaction(Propagation.REQUIRED, block);
     }
 
+    /**
+     * Execute a transaction by the specified {@link Propagation} behavior
+     *
+     * <ul>
+     *     <li>If an IOC framework is used, its implementation
+     *     should be an encapsulation of the transaction management
+     *     within the IOC framework. Taking {@code jimmer-spring-starter}
+     *     as an example, it is the {@code SpringConnectionManager}
+     *     which will be created and enabled automatically.</li>
+     *
+     *     <li>If no IOC framework is used, the class
+     *     {@link AbstractTxConnectionManager} is the
+     *     lightweight implementation provided by jimmer,
+     *     please specify the connection manager of sqlClient by
+     *     {@link ConnectionManager#simpleConnectionManager(DataSource)}</li>
+     * </ul>
+     *
+     * @param propagation The propagation behavior
+     * @param block The action to be executed in transaction
+     * @return The result of transaction
+     */
     <R> R transaction(Propagation propagation, Supplier<R> block);
 
     interface Builder {

project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntityInvestigator.java

@@ -288,9 +288,11 @@ private Exception translateAll() {
                     if (associatedObject == null) {
                         continue;
                     }
-                    Object associatedId = ((ImmutableSpi)associatedObject).__get(
-                        prop.getTargetType().getIdProp().getId()
-                    );
+                    PropId targetIdPropId = prop.getTargetType().getIdProp().getId();
+                    if (!((ImmutableSpi)associatedObject).__isLoaded(targetIdPropId)) {
+                        continue;
+                    }
+                    Object associatedId = ((ImmutableSpi)associatedObject).__get(targetIdPropId);
                     targetIdMultiMap
                             .computeIfAbsent(prop, it -> new LinkedHashSet<>())
                             .add(associatedId);