#1521 - Add API for using explicit transaction for UpdateQuery - e.g. ebeanServer.update(Customer.class)...update(activeTransaction);

src/main/java/io/ebean/ExpressionList.java

@@ -166,6 +166,18 @@ public interface ExpressionList<T> {
    */
   int delete();
 
+  /**
+   * Execute as a delete query deleting the 'root level' beans that match the predicates
+   * in the query.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @return the number of rows that were deleted.
+   */
+  int delete(Transaction transaction);
+
   /**
    * Execute as a update query.
    *
@@ -174,6 +186,14 @@ public interface ExpressionList<T> {
    */
   int update();
 
+  /**
+   * Execute as a update query with the given transaction.
+   *
+   * @return the number of rows that were updated.
+   * @see UpdateQuery
+   */
+  int update(Transaction transaction);
+
   /**
    * Execute the query iterating over the results.
    *

src/main/java/io/ebean/Query.java

@@ -924,11 +924,31 @@ public interface Query<T> {
    */
   int delete();
 
+  /**
+   * Execute as a delete query returning the number of rows deleted using the given transaction.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @return the number of beans/rows that were deleted.
+   */
+  int delete(Transaction transaction);
+
   /**
    * Execute the UpdateQuery returning the number of rows updated.
+   *
+   * @return the number of beans/rows updated.
    */
   int update();
 
+  /**
+   * Execute the UpdateQuery returning the number of rows updated using the given transaction.
+   *
+   * @return the number of beans/rows updated.
+   */
+  int update(Transaction transaction);
+
   /**
    * Return the count of entities this query should return.
    * <p>

src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java

@@ -17,6 +17,7 @@ import io.ebean.PagedList;
 import io.ebean.Pairs;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.Match;
@@ -356,11 +357,21 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.delete();
   }
 
+  @Override
+  public int delete(Transaction transaction) {
+    return query.delete(transaction);
+  }
+
   @Override
   public int update() {
     return query.update();
   }
 
+  @Override
+  public int update(Transaction transaction) {
+    return query.update(transaction);
+  }
+
   @Override
   public FutureIds<T> findFutureIds() {
     return query.findFutureIds();

src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java

@@ -16,6 +16,7 @@ import io.ebean.PagedList;
 import io.ebean.Pairs;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.Match;
@@ -318,11 +319,21 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.delete();
   }
 
+  @Override
+  public int delete(Transaction transaction) {
+    return exprList.delete(transaction);
+  }
+
   @Override
   public int update() {
     return exprList.update();
   }
 
+  @Override
+  public int update(Transaction transaction) {
+    return exprList.update(transaction);
+  }
+
   @Override
   public Query<T> asOf(Timestamp asOf) {
     return exprList.asOf(asOf);

src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -21,6 +21,7 @@ import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.QueryType;
 import io.ebean.RawSql;
+import io.ebean.Transaction;
 import io.ebean.Version;
 import io.ebean.bean.CallStack;
 import io.ebean.bean.ObjectGraphNode;
@@ -1384,11 +1385,21 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.delete(this, null);
   }
 
+  @Override
+  public int delete(Transaction transaction) {
+    return server.delete(this, transaction);
+  }
+
   @Override
   public int update() {
     return server.update(this, null);
   }
 
+  @Override
+  public int update(Transaction transaction) {
+    return server.update(this, transaction);
+  }
+
   @Override
   public <A> List<A> findIds() {
     // a copy of this query is made in the server