#432 - Delete using Query does not commit

src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java

@@ -59,11 +59,6 @@ public class ScopedTransaction implements SpiTransaction {
     }
   }
 
-  @Override
-  public void endQueryOnly() {
-    transaction.endQueryOnly();
-  }
-
   @Override
   public String getLogPrefix() {
     return transaction.getLogPrefix();

src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java

@@ -19,11 +19,6 @@ import com.avaje.ebeaninternal.server.persist.BatchControl;
  */
 public interface SpiTransaction extends Transaction {
 
-  /**
-   * End the transaction when had query only use.
-   */
-  void endQueryOnly();
-
   /**
    * Return the string prefix with the transactin id and label used in logging.
    */

src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java

@@ -1301,6 +1301,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.DELETE, query, t);
     try {
       request.initTransIfRequired();
+      request.markNotQueryOnly();
       return request.delete();
     } finally {
       request.endTransIfRequired();

src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java

@@ -72,6 +72,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
     this.readOnly = query.isReadOnly();
   }
 
+  /**
+   * Mark the transaction as not being query only.
+   */
+  @Override
+  public void markNotQueryOnly() {
+    transaction.markNotQueryOnly();
+  }
 
   /**
    * Return the database platform like clause.
@@ -219,7 +226,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
    */
   public void endTransIfRequired() {
     if (createdTransaction) {
-      transaction.endQueryOnly();
+      transaction.commit();
     }
   }
 

src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java

@@ -59,7 +59,7 @@ public final class RelationalQueryRequest {
      */
     public void endTransIfRequired() {
         if (createdTransaction) {
-            trans.endQueryOnly();
+            trans.commit();
         }
     }
 

src/main/java/com/avaje/ebeaninternal/server/core/SpiOrmQueryRequest.java

@@ -112,4 +112,8 @@ public interface SpiOrmQueryRequest<T> {
    */
   String getDBLikeClause();
 
+  /**
+   * Mark the underlying transaction as not being query only.
+   */
+  void markNotQueryOnly();
 }

src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -849,23 +849,6 @@ public class JdbcTransaction implements SpiTransaction {
     connection.commit();
   }
 
-  /**
-   * End the transaction on a query only request.
-   */
-  @Override
-  public void endQueryOnly() {
-    if (!isActive()) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
-    try {
-      connectionEndForQueryOnly();
-    } finally {
-      // these will not throw an exception
-      deactivate();
-      notifyQueryOnly();
-    }
-  }
-
   /**
    * Commit the transaction.
    */

src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java

@@ -5,6 +5,8 @@ import com.avaje.ebean.Ebean;
 import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.Query;
 import com.avaje.tests.model.basic.Contact;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -49,4 +51,23 @@ public class TestDeleteByQuery extends BaseTestCase {
     assertThat(list).isEmpty();
   }
 
+  @Test
+  public void testCommit() {
+
+    ResetBasicData.reset();
+
+    List<Customer> all = Customer.find.all();
+    Contact contact = new Contact();
+    contact.setFirstName("DelByQueryFirstName");
+    contact.setLastName("deleteMe");
+    contact.setCustomer(all.get(0));
+
+    Ebean.save(contact);
+
+    Ebean.find(Contact.class).select("id").where().eq("firstName", "DelByQueryFirstName").delete();
+
+    Contact contactFind = Ebean.find(Contact.class, contact.getId());
+    assertThat(contactFind).isNull();
+
+  }
 }