#2002 - Support maxRows with delete query

src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -458,7 +458,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   /**
    * Set the query to be a delete query.
    */
-  void setupForDeleteOrUpdate(boolean deleteRequest);
+  void setupForDeleteOrUpdate();
 
   /**
    * Set the query to be delete by ids due to cascading delete.

src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -95,7 +95,7 @@ class CQueryBuilder {
 
     SpiQuery<T> query = request.getQuery();
     String rootTableAlias = query.getAlias();
-    query.setupForDeleteOrUpdate(deleteRequest);
+    query.setupForDeleteOrUpdate();
 
     CQueryPredicates predicates = new CQueryPredicates(binder, request);
     CQueryPlan queryPlan = request.getQueryPlan();
@@ -125,7 +125,7 @@ class CQueryBuilder {
   private <T> String buildDeleteSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
 
     String alias = alias(rootTableAlias);
-    if (sqlTree.noJoins()) {
+    if (sqlTree.noJoins() && !request.getQuery().hasMaxRowsOrFirstRow()) {
       if (dbPlatform.isSupportsDeleteTableAlias()) {
         // delete from table <alias> ...
         return aliasReplace(buildSqlDelete("delete", request, predicates, sqlTree).getSql(), alias);

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

@@ -684,13 +684,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    * Setup to be a delete or update query.
    */
   @Override
-  public void setupForDeleteOrUpdate(boolean deleteRequest) {
-    // unset any paging and select on the id in the case where the query
-    // includes joins and we use - delete ... where id in (...)
-    if (deleteRequest) {
-      maxRows = 0;
-    }
-    firstRow = 0;
+  public void setupForDeleteOrUpdate() {
     forUpdate = null;
     rootTableAlias = "${RTA}"; // alias we remove later
     setSelectId();